[ci skip] Fix

doorkeeper-gem · Jan 31, 2018 · d87618a · d87618a
1 parent 543853d
commit d87618a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -17,6 +17,7 @@ gemfile:
   - gemfiles/rails_4_2.gemfile
   - gemfiles/rails_5_0.gemfile
   - gemfiles/rails_5_1.gemfile
+  - gemfiles/rails_5_2.gemfile
   - gemfiles/rails_master.gemfile
 
 matrix:

diff --git a/spec/controllers/authorizations_controller_spec.rb b/spec/controllers/authorizations_controller_spec.rb
@@ -3,7 +3,7 @@
 describe Doorkeeper::AuthorizationsController, 'implicit grant flow' do
   include AuthorizationRequestHelper
 
-  if Rails::VERSION::MAJOR == 5
+  if Rails::VERSION::MAJOR >= 5
     class ActionDispatch::TestResponse
       def query_params
         @_query_params ||= begin

diff --git a/spec/requests/endpoints/token_spec.rb b/spec/requests/endpoints/token_spec.rb
@@ -11,7 +11,7 @@
     should_have_header 'Pragma', 'no-cache'
 
     # Rails 5.2 changed headers
-    if ::Rails::VERSION::MAJOR >= 5 && ::Rails::VERSION::MINOR >= 2
+    if ::Rails::VERSION::MAJOR >= 5 && ::Rails::VERSION::MINOR >= 2 || ::Rails::VERSION::MAJOR >= 6
       should_have_header 'Cache-Control', 'private, no-store'
     else
       should_have_header 'Cache-Control', 'no-store'