Skip to content

Commit 09e91f7

Browse files
authored
Merge pull request risuiowa#94 from shanecav84/patch-1
Avoid Rails 5.2 deprecation warning
2 parents 763288c + 73ff90c commit 09e91f7

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

lib/rails-jquery-autocomplete/orm/active_record.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@ def active_record_get_autocomplete_order(method, options, model=nil)
55
order = options[:order]
66

77
table_prefix = model ? "#{model.table_name}." : ""
8-
if sqlite?
8+
sql = if sqlite?
99
order || "LOWER(#{method}) ASC"
1010
else
1111
order || "LOWER(#{table_prefix}#{method}) ASC"
1212
end
13+
14+
Arel.sql(sql)
1315
end
1416

1517
def active_record_get_autocomplete_items(parameters)

rails-jquery-autocomplete.gemspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@ Gem::Specification.new do |s|
1616
s.add_dependency('rails', '>= 3.2')
1717

1818
s.add_development_dependency 'sqlite3-ruby'
19+
s.add_development_dependency 'minitest'
1920
s.add_development_dependency 'mongoid', '>= 2.0.0'
2021
s.add_development_dependency 'mongo_mapper', '>= 0.9'
2122
#s.add_development_dependency 'mongo', '~> 1.6.2'
2223
s.add_development_dependency 'bson_ext', '~> 1.6.2'
2324
s.add_development_dependency 'guard'
2425
s.add_development_dependency 'guard-test'
25-
s.add_development_dependency 'test-unit', '~> 2.2.0'
26+
s.add_development_dependency 'test-unit-rr'
2627
s.add_development_dependency 'shoulda', '~> 3.0.1'
2728
s.add_development_dependency 'uglifier'
28-
s.add_development_dependency 'rr'
2929
s.add_development_dependency 'simple_form', '~>1.5'
3030
s.add_development_dependency 'debugger' if RUBY_VERSION < '2.0.0'
3131
s.add_development_dependency 'byebug' if RUBY_VERSION > '2.0.0'

test/test_helper.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,12 @@ def self.env
1111
end
1212
end
1313

14+
require 'minitest/autorun'
1415
require 'rails/all'
1516
require 'mongoid'
1617
require 'mongo_mapper'
1718
require 'shoulda'
18-
require 'rr'
19+
require 'test/unit/rr'
1920
require 'rails/test_help'
2021
require 'rails-jquery-autocomplete'
2122

0 commit comments

Comments
 (0)