From afa2da51397c64ebbe94de44030746994dfbae2f Mon Sep 17 00:00:00 2001 From: Matthieu Paret Date: Mon, 17 Oct 2016 10:49:52 +0200 Subject: [PATCH 1/2] update rubies to last version test rails 5.0 --- .travis.yml | 15 +++++++++++++-- Gemfile.rails50 | 5 +++++ 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 Gemfile.rails50 diff --git a/.travis.yml b/.travis.yml index c0b78f0f..c96a43ae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,10 +3,21 @@ sudo: false rvm: - 1.9.3 - 2.0.0 - - 2.1.7 - - 2.2.3 + - 2.1.10 + - 2.2.5 + - 2.3.1 gemfile: - Gemfile.rails32 - Gemfile.rails40 - Gemfile.rails41 - Gemfile.rails42 + - Gemfile.rails50 + +matrix: + exclude: + - rvm: 1.9.3 + gemfile: Gemfile.rails50 + - rvm: 2.0.0 + gemfile: Gemfile.rails50 + - rvm: 2.1.10 + gemfile: Gemfile.rails50 \ No newline at end of file diff --git a/Gemfile.rails50 b/Gemfile.rails50 new file mode 100644 index 00000000..a8e701ae --- /dev/null +++ b/Gemfile.rails50 @@ -0,0 +1,5 @@ +source "https://rubygems.org" + +gemspec + +gem 'rails', '~> 5.0.0' \ No newline at end of file From bbc26177494113529a064d0f386df92db184a143 Mon Sep 17 00:00:00 2001 From: Matthieu Paret Date: Mon, 17 Oct 2016 18:24:44 +0200 Subject: [PATCH 2/2] fix routes for rails 5 --- spec/dummy/config/routes.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/spec/dummy/config/routes.rb b/spec/dummy/config/routes.rb index 2d3d48b0..fe85d82c 100644 --- a/spec/dummy/config/routes.rb +++ b/spec/dummy/config/routes.rb @@ -5,20 +5,20 @@ scope '/api' do resources :users do collection do - post :create_route + post :create_route => 'users#create_route' end end resources :concerns, :only => [:index, :show] namespace :files do - get '/*file_path', to: :download, format: false + get '/*file_path' => 'files#download', format: false end resources :twitter_example do collection do - get :lookup + get :lookup => 'twitter_example#lookup' get 'profile_image/:screen_name' => 'twitter_example#profile_image' - get :search - get :search - get :contributors + get :search => 'twitter_example#search' + get :search => 'twitter_example#search' + get :contributors => 'twitter_example#contributors' end end end