Skip to content

Commit f6cef15

Browse files
wadetandyJack Casey
authored andcommitted
Add testing for rails 5.0.x and 5.1.x
Previously these hadn't been tested and small differences in active record caused some breakages. This also fixes one of those breakages.
1 parent fccf89f commit f6cef15

File tree

6 files changed

+98
-10
lines changed

6 files changed

+98
-10
lines changed

.travis.yml

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,13 @@ rvm:
66
gemfile:
77
- Gemfile
88
- gemfiles/rails_4.gemfile
9-
- gemfiles/rails_5.gemfile
9+
- gemfiles/rails_5_0.gemfile
10+
- gemfiles/rails_5_1.gemfile
11+
- gemfiles/rails_5_2.gemfile
1012
- gemfiles/rails_6.gemfile
11-
- gemfiles/rails_5_graphiti_rails.gemfile
13+
- gemfiles/rails_5_0_graphiti_rails.gemfile
14+
- gemfiles/rails_5_1_graphiti_rails.gemfile
15+
- gemfiles/rails_5_2_graphiti_rails.gemfile
1216
- gemfiles/rails_6_graphiti_rails.gemfile
1317
env:
1418
- COMMAND="standardrb --no-fix --format progress"
@@ -19,7 +23,11 @@ matrix:
1923
- env: COMMAND="standardrb --no-fix --format progress"
2024
gemfile: gemfiles/rails_4.gemfile
2125
- env: COMMAND="standardrb --no-fix --format progress"
22-
gemfile: gemfiles/rails_5.gemfile
26+
gemfile: gemfiles/rails_5_0.gemfile
27+
- env: COMMAND="standardrb --no-fix --format progress"
28+
gemfile: gemfiles/rails_5_1.gemfile
29+
- env: COMMAND="standardrb --no-fix --format progress"
30+
gemfile: gemfiles/rails_5_2.gemfile
2331
- env: COMMAND="standardrb --no-fix --format progress"
2432
gemfile: gemfiles/rails_6.gemfile
2533
- env: COMMAND="standardrb --no-fix --format progress"
@@ -31,11 +39,19 @@ matrix:
3139
- env: COMMAND=rspec
3240
gemfile: gemfiles/rails_4.gemfile
3341
- env: COMMAND=rspec
34-
gemfile: gemfiles/rails_5.gemfile
42+
gemfile: gemfiles/rails_5_0.gemfile
43+
- env: COMMAND=rspec
44+
gemfile: gemfiles/rails_5_1.gemfile
45+
- env: COMMAND=rspec
46+
gemfile: gemfiles/rails_5_2.gemfile
3547
- env: COMMAND=rspec
3648
gemfile: gemfiles/rails_6.gemfile
3749
- env: COMMAND=rspec
38-
gemfile: gemfiles/rails_5_graphiti_rails.gemfile
50+
gemfile: gemfiles/rails_5_0_graphiti_rails.gemfile
51+
- env: COMMAND=rspec
52+
gemfile: gemfiles/rails_5_1_graphiti_rails.gemfile
53+
- env: COMMAND=rspec
54+
gemfile: gemfiles/rails_5_2_graphiti_rails.gemfile
3955
- env: COMMAND=rspec
4056
gemfile: gemfiles/rails_6_graphiti_rails.gemfile
4157
- gemfile: gemfiles/rails_4.gemfile

Appraisals

Lines changed: 36 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,50 @@
11
appraise "rails-4" do
2-
gem "rails", "~> 4.1"
2+
gem "rails", "~> 4.2"
33
gem "rspec-rails"
44
gem "sqlite3", "~> 1.3.6"
55
gem "database_cleaner"
66
end
77

8-
appraise "rails-5" do
8+
appraise "rails-5_0" do
9+
gem "rails", "~> 5.0"
10+
gem "rspec-rails"
11+
gem "sqlite3", "~> 1.3.6"
12+
gem "database_cleaner"
13+
end
14+
15+
appraise "rails-5_1" do
16+
gem "rails", "~> 5.1"
17+
gem "rspec-rails"
18+
gem "sqlite3", "~> 1.3.6"
19+
gem "database_cleaner"
20+
end
21+
22+
appraise "rails-5_2" do
923
gem "rails", "~> 5.2"
1024
gem "rspec-rails"
1125
gem "sqlite3", "~> 1.3.6"
1226
gem "database_cleaner"
1327
end
1428

15-
appraise "rails-5-graphiti-rails" do
29+
appraise "rails-5_0-graphiti-rails" do
30+
gem "rails", "~> 5.0"
31+
gem "rspec-rails"
32+
gem "sqlite3", "~> 1.3.6"
33+
gem "database_cleaner"
34+
gem "rescue_registry", git: "https://github.com/wagenet/rescue_registry.git", branch: "master"
35+
gem "graphiti-rails", git: "https://github.com/wagenet/graphiti-rails.git", branch: "master"
36+
end
37+
38+
appraise "rails-5_1-graphiti-rails" do
39+
gem "rails", "~> 5.1"
40+
gem "rspec-rails"
41+
gem "sqlite3", "~> 1.3.6"
42+
gem "database_cleaner"
43+
gem "rescue_registry", git: "https://github.com/wagenet/rescue_registry.git", branch: "master"
44+
gem "graphiti-rails", git: "https://github.com/wagenet/graphiti-rails.git", branch: "master"
45+
end
46+
47+
appraise "rails-5_2-graphiti-rails" do
1648
gem "rails", "~> 5.2"
1749
gem "rspec-rails"
1850
gem "sqlite3", "~> 1.3.6"
@@ -29,7 +61,7 @@ appraise "rails-6" do
2961
end
3062

3163
appraise "rails-6-graphiti-rails" do
32-
gem "rails", "~> 6.0.0.rc1"
64+
gem "rails", "~> 6.0"
3365
gem "rspec-rails"
3466
gem "sqlite3", "~> 1.4.0"
3567
gem "database_cleaner"

gemfiles/rails_5_0.gemfile

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# This file was generated by Appraisal
2+
3+
source "https://rubygems.org"
4+
5+
gem "rails", "~> 5.0.0"
6+
gem "rspec-rails"
7+
gem "sqlite3", "~> 1.3.6"
8+
gem "database_cleaner"
9+
10+
group :test do
11+
gem "pry"
12+
gem "pry-byebug", platform: [:mri]
13+
gem "appraisal"
14+
gem "guard"
15+
gem "guard-rspec"
16+
end
17+
18+
gemspec path: "../"

gemfiles/rails_5_1.gemfile

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# This file was generated by Appraisal
2+
3+
source "https://rubygems.org"
4+
5+
gem "rails", "~> 5.1.7"
6+
gem "rspec-rails"
7+
gem "sqlite3", "~> 1.3.6"
8+
gem "database_cleaner"
9+
10+
group :test do
11+
gem "pry"
12+
gem "pry-byebug", platform: [:mri]
13+
gem "appraisal"
14+
gem "guard"
15+
gem "guard-rspec"
16+
end
17+
18+
gemspec path: "../"
File renamed without changes.

lib/graphiti/adapters/active_record.rb

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ def sanitized_like_for(scope, attribute, value, &block)
313313
column = column_for(scope, attribute)
314314
map = value.map do |v|
315315
v = v.downcase
316-
v = Sanitizer.sanitize_sql_like(v)
316+
v = Sanitizer.sanitize_like(v, escape_char)
317317
block.call v
318318
end
319319

@@ -322,6 +322,10 @@ def sanitized_like_for(scope, attribute, value, &block)
322322

323323
class Sanitizer
324324
extend ::ActiveRecord::Sanitization::ClassMethods
325+
326+
def self.sanitize_like(*args)
327+
sanitize_sql_like(*args)
328+
end
325329
end
326330
end
327331
end

0 commit comments

Comments
 (0)