diff --git a/.travis.yml b/.travis.yml index ab47a5c..685084c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,9 @@ script: bundle exec rspec spec +env: + matrix: + - RAILS=4.0.13 + - RAILS=4.1.5 + - RAILS=4.2.6 rvm: - 2.1.5 - 2.2.0 diff --git a/Gemfile b/Gemfile index 582b9aa..a24dad8 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ source 'https://rubygems.org' gemspec group :test do gem 'sprockets-rails', '2.3.3' - gem 'rails', '4.2.0' + gem 'rails', '~> 4.0.0' gem 'rspec-rails' gem 'activeadmin', github: 'activeadmin' , ref: 'd787029e5523be2eb2ed99816eb0cecca2b72862' gem 'coveralls', require: false # Test coverage website. Go to https://coveralls.io diff --git a/lib/active_admin_datetimepicker/base.rb b/lib/active_admin_datetimepicker/base.rb index 7996bb3..268f31e 100644 --- a/lib/active_admin_datetimepicker/base.rb +++ b/lib/active_admin_datetimepicker/base.rb @@ -1,12 +1,9 @@ module ActiveAdminDatetimepicker module Base - mattr_accessor :default_datetime_picker_options do - {} - end - - mattr_accessor :format do - '%Y-%m-%d %H:%M' - end + mattr_accessor :default_datetime_picker_options + @@default_datetime_picker_options = {} + mattr_accessor :format + @@format = '%Y-%m-%d %H:%M' def html_class 'date-time-picker'