Permalink
Browse files

updated require for test_helper to be compatible with ruby 1.9.2 and …

…updated the actionpack dependency to 2.3.8.
  • Loading branch information...
1 parent 085008b commit 2a61be8020d43d0d6a5b7d82e47b53b00456fd92 @ecavazos ecavazos committed with quirkey Jul 21, 2010
View
@@ -12,7 +12,7 @@ begin
s.description = "OAuth Core Ruby implementation"
s.summary = s.description
s.rubyforge_project = %q{oauth}
- s.add_development_dependency(%q<actionpack>, [">= 2.2.0", "<2.3.0"])
+ s.add_development_dependency(%q<actionpack>, ["2.3.8"])
s.add_development_dependency(%q<rack>, [">= 1.0.0"])
s.add_development_dependency(%q<mocha>, [">= 0.9.8"])
s.add_development_dependency(%q<typhoeus>, [">= 0.1.13"])
@@ -1,6 +1,5 @@
require 'active_support'
require 'action_controller'
-require 'action_controller/request'
require 'uri'
module OAuth::RequestProxy
View
@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["Pelle Braendgaard", "Blaine Cook", "Larry Halff", "Jesse Clark", "Jon Crosby", "Seth Fitzsimmons", "Matt Sanford", "Aaron Quint"]
- s.date = %q{2010-06-16}
+ s.date = %q{2010-07-21}
s.default_executable = %q{oauth}
s.description = %q{OAuth Core Ruby implementation}
s.email = %q{oauth-ruby@googlegroups.com}
@@ -109,7 +109,7 @@ Gem::Specification.new do |s|
s.rdoc_options = ["--charset=UTF-8"]
s.require_paths = ["lib"]
s.rubyforge_project = %q{oauth}
- s.rubygems_version = %q{1.3.6}
+ s.rubygems_version = %q{1.3.7}
s.summary = %q{OAuth Core Ruby implementation}
s.test_files = [
"test/cases/oauth_case.rb",
@@ -145,23 +145,23 @@ Gem::Specification.new do |s|
current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
s.specification_version = 3
- if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
- s.add_development_dependency(%q<actionpack>, [">= 2.2.0", "< 2.3.0"])
+ if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+ s.add_development_dependency(%q<actionpack>, ["= 2.3.8"])
s.add_development_dependency(%q<rack>, [">= 1.0.0"])
s.add_development_dependency(%q<mocha>, [">= 0.9.8"])
s.add_development_dependency(%q<typhoeus>, [">= 0.1.13"])
s.add_development_dependency(%q<em-http-request>, [">= 0"])
s.add_development_dependency(%q<curb>, [">= 0.6.6.0"])
else
- s.add_dependency(%q<actionpack>, [">= 2.2.0", "< 2.3.0"])
+ s.add_dependency(%q<actionpack>, ["= 2.3.8"])
s.add_dependency(%q<rack>, [">= 1.0.0"])
s.add_dependency(%q<mocha>, [">= 0.9.8"])
s.add_dependency(%q<typhoeus>, [">= 0.1.13"])
s.add_dependency(%q<em-http-request>, [">= 0"])
s.add_dependency(%q<curb>, [">= 0.6.6.0"])
end
else
- s.add_dependency(%q<actionpack>, [">= 2.2.0", "< 2.3.0"])
+ s.add_dependency(%q<actionpack>, ["= 2.3.8"])
s.add_dependency(%q<rack>, [">= 1.0.0"])
s.add_dependency(%q<mocha>, [">= 0.9.8"])
s.add_dependency(%q<typhoeus>, [">= 0.1.13"])
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../oauth_case'
+require File.expand_path('../../../oauth_case', __FILE__)
# See http://oauth.net/core/1.0/#anchor14
#
@@ -59,4 +59,4 @@ def assert_request_url(expected,given,message=nil)
assert_equal expected, request({},'GET',given).normalized_uri, message
end
-end
+end
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../oauth_case'
+require File.expand_path('../../../oauth_case', __FILE__)
# See http://oauth.net/core/1.0/#anchor14
#
@@ -85,4 +85,4 @@ def assert_normalized(expected,params,message=nil)
def normalize_request_parameters(params={})
request(params).normalized_parameters
end
-end
+end
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../oauth_case'
+require File.expand_path('../../../oauth_case', __FILE__)
# See http://oauth.net/core/1.0/#encoding_parameters
#
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../oauth_case'
+require File.expand_path('../../../oauth_case', __FILE__)
# See http://oauth.net/core/1.0/#anchor14
#
@@ -74,4 +74,4 @@ def assert_signature_base_string(expected,params={},method='GET',uri="http://pho
def signature_base_string(params={},method='GET',uri="http://photos.example.net/photos")
request(params,method,uri).signature_base_string
end
-end
+end
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require File.expand_path('../../test_helper', __FILE__)
module Integration
class ConsumerTest < Test::Unit::TestCase
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
+require File.expand_path('../test_helper', __FILE__)
class TestAccessToken < Test::Unit::TestCase
def setup
@@ -23,4 +23,4 @@ def test_access_token_makes_non_oauth_response_params_available
assert_not_nil @access_token.params[:user_id]
assert_equal 5734758743895, @access_token.params[:user_id]
end
-end
+end
@@ -1,5 +1,5 @@
-gem 'actionpack', '>2.2.0', '<2.3.0'
-require File.dirname(__FILE__) + '/test_helper.rb'
+gem 'actionpack', '2.3.8'
+require File.expand_path('../test_helper', __FILE__)
require 'oauth/request_proxy/action_controller_request'
require 'action_controller/test_process'
View
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.expand_path('../test_helper', __FILE__)
require 'mocha'
require 'stringio'
@@ -1,4 +1,4 @@
-require 'test_helper'
+require File.expand_path('../test_helper', __FILE__)
begin
require 'oauth/request_proxy/curb_request'
@@ -73,4 +73,4 @@ def test_that_proxy_post_request_works_with_mixed_parameter_sources
assert_equal expected_parameters, request_proxy.parameters_for_signature
assert_equal 'http://example.com/test', request_proxy.normalized_uri
end
-end
+end
@@ -1,4 +1,4 @@
-require 'test_helper'
+require File.expand_path('../test_helper', __FILE__)
begin
require 'oauth/client/em_http'
rescue LoadError => e
@@ -1,4 +1,4 @@
-require 'test_helper'
+require File.expand_path('../test_helper', __FILE__)
begin
require 'em-http'
@@ -111,4 +111,4 @@ def create_request_proxy(opts = {})
OAuth::RequestProxy.proxy(create_client(opts), arguments)
end
-end
+end
View
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
+require File.expand_path('../test_helper', __FILE__)
class TestSignatureHmacSha1 < Test::Unit::TestCase
def test_that_hmac_sha1_implements_hmac_sha1
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
+require File.expand_path('../test_helper', __FILE__)
class NetHTTPClientTest < Test::Unit::TestCase
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
+require File.expand_path('../test_helper', __FILE__)
class NetHTTPRequestProxyTest < Test::Unit::TestCase
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
+require File.expand_path('../test_helper', __FILE__)
class TestOAuthHelper < Test::Unit::TestCase
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
+require File.expand_path('../test_helper', __FILE__)
require 'oauth/request_proxy/rack_request'
require 'rack/request'
require 'rack/mock'
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
+require File.expand_path('../test_helper', __FILE__)
class StubbedToken < OAuth::RequestToken
define_method :build_authorize_url_promoted do |root_domain, params|
@@ -48,4 +48,4 @@ def test_build_authorize_url
assert url
assert_equal "http://github.com/oauth/authorize?foo=bar+bar", url
end
-end
+end
View
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
+require File.expand_path('../test_helper', __FILE__)
require 'oauth/consumer'
require 'oauth/signature/rsa/sha1'
View
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.expand_path('../test_helper', __FILE__)
require 'oauth/server'
class ServerTest < Test::Unit::TestCase
def setup
View
@@ -1,6 +1,6 @@
# -*- encoding: utf-8 -*-
-require File.dirname(__FILE__) + '/test_helper.rb'
+require File.expand_path('../test_helper', __FILE__)
class TestOauth < Test::Unit::TestCase
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
+require File.expand_path('../test_helper', __FILE__)
require 'oauth/signature/base'
require 'net/http'
class SignatureBaseTest < Test::Unit::TestCase
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
+require File.expand_path('../test_helper', __FILE__)
require 'oauth/signature/plaintext'
class TestSignaturePlaintext < Test::Unit::TestCase
View
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
+require File.expand_path('../test_helper', __FILE__)
require 'oauth/token'
class TestToken < Test::Unit::TestCase
@@ -1,4 +1,4 @@
-require 'test_helper'
+require File.expand_path('../test_helper', __FILE__)
begin
require 'oauth/request_proxy/typhoeus_request'

0 comments on commit 2a61be8

Please sign in to comment.