Merge 278c4da into 09747cb

sds · May 13, 2020 · 00482b1 · 00482b1
2 parents 09747cb + 278c4da
commit 00482b1
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/lib/mock_redis/database.rb b/lib/mock_redis/database.rb
@@ -323,7 +323,7 @@ def redis_pattern_to_ruby_regex(pattern)
       Regexp.new(
         "^#{pattern}$".
         gsub(/([+|()])/, '\\\\\1').
-        gsub(/([^\\])\?/, '\\1.').
+        gsub(/(?<!\\)\?/, '\\1.').
         gsub(/([^\\])\*/, '\\1.*')
       )
     end

diff --git a/spec/commands/keys_spec.rb b/spec/commands/keys_spec.rb
@@ -29,6 +29,7 @@
 
       @redises.set('mock-redis-test:special-key?', 'true')
       @redises.set('mock-redis-test:special-key*', 'true')
+      @redises.set('mock-redis-test:special-key-!?*', 'true')
     end
 
     describe 'the ? character' do
@@ -53,6 +54,22 @@
           'mock-redis-test:special-key?',
         ]
       end
+
+      context 'multiple ? characters' do
+        it "properly handles multiple consequtive '?' characters" do
+          @redises.keys('mock-redis-test:special-key-???').sort.should == [
+            'mock-redis-test:special-key-!?*',
+          ]
+        end
+
+        context '\\? as a literal ' do
+          it 'handles multiple ? as both literal and special character' do
+            @redises.keys('mock-redis-test:special-key-?\??').sort.should == [
+              'mock-redis-test:special-key-!?*',
+            ]
+          end
+        end
+      end
     end
 
     describe 'the * character' do