Merge pull request #719 from cerebris/rails5

rails5rc1

Author: lgebhardt

.travis.yml

@@ -3,12 +3,14 @@ sudo: false
 env:
   - "RAILS_VERSION=4.1.0"
   - "RAILS_VERSION=4.2.6"
-  - "RAILS_VERSION=5.0.0.beta3"
+  - "RAILS_VERSION=5.0.0.rc1"
 rvm:
   - 2.1
   - 2.2.4
   - 2.3.0
 matrix:
   exclude:
+    - rvm: 2.0
+      env: "RAILS_VERSION=5.0.0.rc1"
     - rvm: 2.1
-      env: "RAILS_VERSION=5.0.0.beta3"
+      env: "RAILS_VERSION=5.0.0.rc1"

test/controllers/controller_test.rb

@@ -374,7 +374,7 @@ def test_sorting_by_relationship_field
 
   def test_desc_sorting_by_relationship_field
     post  = create_alphabetically_first_user_and_post
-    get :index, {sort: '-author.name'}
+    get :index, params: {sort: '-author.name'}
 
     assert_response :success
     assert json_response['data'].length > 10, 'there are enough records to show sort'
@@ -424,7 +424,7 @@ def test_show_does_not_include_records_count_in_meta
 
   def test_show_does_not_include_pages_count_in_meta
     JSONAPI.configuration.top_level_meta_include_page_count = true
-    get :show, { id: Post.first.id }
+    get :show, params: { id: Post.first.id }
     assert_response :success
     assert_equal json_response['meta'], nil
   ensure

test/test_helper.rb

@@ -5,7 +5,7 @@
 
 # To test on a specific rails version use this:
 # export RAILS_VERSION=4.2.6; bundle update rails; bundle exec rake test
-# export RAILS_VERSION=5.0.0.beta3; bundle update rails; bundle exec rake test
+# export RAILS_VERSION=5.0.0.rc1; bundle update rails; bundle exec rake test
 
 # We are no longer having Travis test Rails 4.0.x., but you can try it with:
 # export RAILS_VERSION=4.0.0; bundle update rails; bundle exec rake test