Merge pull request #17 from thambley/pr-16

Add support for active admin version 2
thambley · Oct 8, 2019 · 929d8d9 · 929d8d9
2 parents 88d41f6 + 21922af
commit 929d8d9
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 10 deletions.
diff --git a/Gemfile b/Gemfile
@@ -4,15 +4,14 @@ gem 'spreadsheet', '~> 1.1', '>= 1.1.4'
 
 group :development, :test do
   gem 'rails-i18n' # Gives us default i18n for many languages
-  gem 'sqlite3', '~> 1.3.0'
   gem 'yard'
 end
 
 group :test do
+  gem 'codecov', require: false
   gem 'cucumber-rails', require: false
   gem 'database_cleaner'
   gem 'rspec-mocks', '~> 3.7'
   gem 'rspec-rails', '~> 3.7'
   gem 'simplecov', require: false
-  gem 'codecov', require: false
 end
diff --git a/README.md b/README.md
@@ -146,18 +146,18 @@ BUNDLE_GEMFILE=gemfiles/rails_42.gemfile bundle exec rake setup
 BUNDLE_GEMFILE=gemfiles/rails_42.gemfile bundle exec rake
 ```
 
-### Rails 5.1
+### Rails 5.2
 
 ```text
-bundle install --gemfile=gemfiles/rails_51.gemfile
+bundle install --gemfile=gemfiles/rails_52.gemfile
 ```
 
 ```text
-BUNDLE_GEMFILE=gemfiles/rails_51.gemfile bundle exec rake setup
+BUNDLE_GEMFILE=gemfiles/rails_52.gemfile bundle exec rake setup
 ```
 
 ```text
-BUNDLE_GEMFILE=gemfiles/rails_51.gemfile bundle exec rake
+BUNDLE_GEMFILE=gemfiles/rails_52.gemfile bundle exec rake
 ```
 
 [Active Admin]:https://www.activeadmin.info/

diff --git a/gemfiles/rails_42.gemfile b/gemfiles/rails_42.gemfile
@@ -6,9 +6,10 @@ ruby_minor_version = RUBY_VERSION.split('.')[1].to_i
 
 eval_gemfile(File.expand_path(File.join('..', 'Gemfile'), __dir__))
 
-gem 'activeadmin', '1.2.1'
+gem 'activeadmin', '1.4.3'
 gem 'devise', '~> 4.2'
-gem 'rails', '4.2.10'
+gem 'rails', '4.2.11'
+gem 'sqlite3', '~> 1.3.0'
 gem 'turbolinks', '~> 5.0.0'
 gem 'tzinfo-data'
 

diff --git a/gemfiles/rails_52.gemfile b/gemfiles/rails_52.gemfile
@@ -7,8 +7,10 @@ ruby_minor_version = RUBY_VERSION.split('.')[1].to_i
 eval_gemfile(File.expand_path(File.join('..', 'Gemfile'), __dir__))
 
 gem 'activeadmin', '2.4.0'
+gem 'bootsnap', require: false
 gem 'devise', '~> 4.7'
 gem 'rails', ' ~> 5.2'
+gem 'sqlite3', '~> 1.4.0'
 gem 'turbolinks', '~> 5.2.0'
 gem 'tzinfo-data'
 

diff --git a/gemfiles/rails_60.gemfile b/gemfiles/rails_60.gemfile
@@ -7,10 +7,13 @@ ruby_minor_version = RUBY_VERSION.split('.')[1].to_i
 eval_gemfile(File.expand_path(File.join('..', 'Gemfile'), __dir__))
 
 gem 'activeadmin', '2.4.0'
+gem 'bootsnap', require: false
 gem 'devise', '~> 4.7'
 gem 'rails', '~> 6'
+gem 'sqlite3', '~> 1.4.0'
 gem 'turbolinks', '~> 5.2.0'
 gem 'tzinfo-data'
+gem 'webpacker', '~> 4.x'
 
 group :test do
   gem 'shoulda-matchers', '~> 3.1'

diff --git a/spec/xls/unit/resource_controller_spec.rb b/spec/xls/unit/resource_controller_spec.rb
@@ -3,7 +3,7 @@
   let(:mime) { Mime::Type.lookup_by_extension(:xls) }
 
   let(:filename) do
-    "#{controller.resource_class.to_s.downcase.pluralize}-#{Time.now.strftime('%Y-%m-%d')}.xls"
+    "categories-#{Time.now.strftime('%Y-%m-%d')}.xls"
   end
 
   it 'generates an xls filename' do
@@ -15,7 +15,7 @@
       request.accept = mime
       get :index
       disposition = "attachment; filename=\"#{filename}\""
-      expect(response.headers['Content-Disposition']).to eq(disposition)
+      expect(response.headers['Content-Disposition']).to start_with(disposition)
       expect(response.headers['Content-Transfer-Encoding']).to eq('binary')
     end
   end