Update for Rails 5 Beta 2

CanCanCommunity · Feb 24, 2016 · 9090f1a · 9090f1a
1 parent 54c18bd
commit 9090f1a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/Appraisals b/Appraisals
@@ -55,8 +55,8 @@ appraise "activerecord_4.2" do
 end
 
 appraise "activerecord_5.0" do
-  gem "activerecord", "~> 5.0.0.beta1", :require => "active_record"
-  gem 'activesupport', '~> 5.0.0.beta1', :require => 'active_support/all'
+  gem "activerecord", "~> 5.0.0.beta2", :require => "active_record"
+  gem 'activesupport', '~> 5.0.0.beta2', :require => 'active_support/all'
 
   gemfile.platforms :jruby do
     gem "activerecord-jdbcsqlite3-adapter"

diff --git a/gemfiles/activerecord_5.0.gemfile b/gemfiles/activerecord_5.0.gemfile
@@ -2,8 +2,8 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 5.0.0.beta1", :require => "active_record"
-gem "activesupport", "~> 5.0.0.beta1", :require => "active_support/all"
+gem "activerecord", "~> 5.0.0.beta2", :require => "active_record"
+gem "activesupport", "~> 5.0.0.beta2", :require => "active_support/all"
 
 platforms :jruby do
   gem "activerecord-jdbcsqlite3-adapter"

diff --git a/lib/cancan.rb b/lib/cancan.rb
@@ -12,7 +12,7 @@
 
 if defined? ActiveRecord
   require 'cancan/model_adapters/active_record_adapter'
-  if ActiveRecord.respond_to?(:version) && ActiveRecord.version >= Gem::Version.new("5.0.0.beta1")
+  if ActiveRecord.respond_to?(:version) && ActiveRecord.version >= Gem::Version.new("5.0.0.beta2")
     require 'cancan/model_adapters/active_record_5_adapter'
   elsif ActiveRecord.respond_to?(:version) && ActiveRecord.version >= Gem::Version.new("4")
     require 'cancan/model_adapters/active_record_4_adapter'

diff --git a/spec/cancan/model_adapters/active_record_adapter_spec.rb b/spec/cancan/model_adapters/active_record_adapter_spec.rb
@@ -82,7 +82,7 @@ class User < ActiveRecord::Base
 
     it "is for only active record classes" do
       if ActiveRecord.respond_to?(:version) &&
-          ActiveRecord.version >= Gem::Version.new("5.0.0.beta1")
+          ActiveRecord.version >= Gem::Version.new("5.0.0.beta2")
         expect(CanCan::ModelAdapters::ActiveRecord5Adapter).to_not be_for_class(Object)
         expect(CanCan::ModelAdapters::ActiveRecord5Adapter).to be_for_class(Article)
         expect(CanCan::ModelAdapters::AbstractAdapter.adapter_class(Article)).to eq(CanCan::ModelAdapters::ActiveRecord5Adapter)