Rails 5 fix glob spec

2d1faddb · Jasper Maes · af07c490 · 2d1faddb · 2d1faddb
Commit 2d1faddb authored Jun 06, 2018 by Jasper Maes
Show whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

changelogs/unreleased/rails5-fix-47376.yml changelogs/unreleased/rails5-fix-47376.yml +5 -0

spec/lib/gitlab/sql/glob_spec.rb spec/lib/gitlab/sql/glob_spec.rb +2 -1

No files found.
--- a/changelogs/unreleased/rails5-fix-47376.yml
+++ b/changelogs/unreleased/rails5-fix-47376.yml
+---
+title: Rails 5 fix glob spec
+merge_request: 19469
+author: Jasper Maes
+type: fixed
--- a/spec/lib/gitlab/sql/glob_spec.rb
+++ b/spec/lib/gitlab/sql/glob_spec.rb
@@ -35,8 +35,9 @@ describe Gitlab::SQL::Glob do
    value = query("SELECT #{quote(string)} LIKE #{pattern}")
              .rows.flatten.first

+    check = Gitlab.rails5? ? true : 't'
    case value
-    when 't', 1
+    when check, 1
      true
    else
      false