Skip to content

Rails 5 #134

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wjordan wants to merge 2 commits into from
Closed

Rails 5 #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d04d56d
Fix ActionControllerRequestProxy test to support Rails 5
wjordan Jul 28, 2016
710c174
update Travis CI build matrix to test Rails 4 and Rails 5
wjordan Jul 28, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
pkg/*
_site
.bundle
Gemfile.lock
Gemfile*.lock
coverage
23 changes: 15 additions & 8 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,22 @@ addons:

language: ruby

before_install: rvm rubygems master --force
install: gem install --file
script: "RUBYGEMS_GEMDEPS=- rake test"

rvm:
Copy link
Member

@mpapis mpapis Jul 29, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@wjordan we needed this line to fix this problem: https://travis-ci.org/oauth-xx/oauth-ruby/jobs/148184710#L190

- "2.3.0"
- "2.2"
- "2.1"
- "2.0"
- 2.3.1
- 2.2.5
- 2.1
- 2.0

gemfile:
- gemfiles/Gemfile.rails-4
- Gemfile

matrix:
exclude:
- rvm: 2.0
gemfile: Gemfile
- rvm: 2.1
gemfile: Gemfile

addons:
code_climate:
Expand Down
4 changes: 0 additions & 4 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
source 'https://rubygems.org'

gemspec

group :test do
gem "codeclimate-test-reporter", require: nil
end
6 changes: 6 additions & 0 deletions gemfiles/Gemfile.rails-4
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
source 'https://rubygems.org'

gemspec path: '../'

gem 'actionpack', '< 5'
gem 'rack', '< 2'
7 changes: 4 additions & 3 deletions oauth.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,16 @@ Gem::Specification.new do |spec|
spec.extra_rdoc_files = [ "LICENSE", "README.rdoc", "TODO" ]

spec.add_development_dependency("rake")
spec.add_development_dependency("minitest")
spec.add_development_dependency("minitest", '>= 5.0')
spec.add_development_dependency("byebug")
spec.add_development_dependency("actionpack", ">= 5.0.0") # TODO: try to allow both Rails versions on next release
spec.add_development_dependency("actionpack")
spec.add_development_dependency("iconv")
spec.add_development_dependency("rack", "~> 1.0") # TODO: try to allow both Rack versions on next release
spec.add_development_dependency("rack")
spec.add_development_dependency("rack-test")
spec.add_development_dependency("mocha", ">= 0.9.12")
spec.add_development_dependency("typhoeus", ">= 0.1.13")
spec.add_development_dependency("em-http-request", "0.2.11")
spec.add_development_dependency("curb")
spec.add_development_dependency("webmock", "< 2.0")
spec.add_development_dependency 'codeclimate-test-reporter'
end
3 changes: 2 additions & 1 deletion test/units/test_action_controller_request_proxy.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
require File.expand_path('../../test_helper_units', __FILE__)

require 'oauth/request_proxy/action_controller_request'
require 'rack/mock'

class ActionControllerRequestProxyTest < Minitest::Test

def request_proxy(request_method = :get, uri_params = {}, body_params = {})
request = ActionDispatch::TestRequest.new
request = ActionDispatch::TestRequest.new(Rack::MockRequest.env_for('/', method: request_method, params: uri_params))
request.request_uri = '/'

case request_method
Expand Down