Skip to content

Commit 380cf9c

Browse files
committed
fixed selenium-webdriver dependency for ruby 1.9
1 parent 6d3f9f4 commit 380cf9c

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ group :test do
2323
gem 'pry'
2424
gem 'database_cleaner'
2525
gem 'capybara'
26-
gem 'selenium-webdriver'
2726
gem 'poltergeist'
27+
gem 'selenium-webdriver', '< 3.0', platforms: :ruby_19
2828
gem 'json', '< 2.0', platforms: :ruby_19 # Json 2.0 requires Ruby >= 2.0
2929
gem 'mime-types', '< 3.0.0', platforms: [:ruby_19, :ruby_20]
3030
gem 'tins', '< 1.3.4', platforms: :ruby_19

lib/active_admin_import/model.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
# frozen_string_literal: true
33

44
require 'rchardet'
5+
require 'zip'
56

67
module ActiveAdminImport
78
class Model
@@ -14,7 +15,7 @@ module CONST
1415
TMP_FILE = 'active-admin-import-unzipped'.freeze
1516
CSV_TYPES = %w(
1617
text/csv
17-
text/csv
18+
text/x-csv
1819
text/x-comma-separated-values
1920
text/comma-separated-values
2021
application/csv

0 commit comments

Comments
 (0)