Add latest changes from gitlab-org/gitlab@master

1 files changed, 53 insertions, 10 deletions

diff --git a/spec/finders/branches_finder_spec.rb b/spec/finders/branches_finder_spec.rb
index f14c60c4b8f..18f8d1adecc 100644
--- a/spec/finders/branches_finder_spec.rb
+++ b/spec/finders/branches_finder_spec.rb
@@ -72,16 +72,6 @@ RSpec.describe BranchesFinder do
         end
       end
 
-      context 'with an unknown name' do
-        let(:params) { { search: 'random' } }
-
-        it 'does not find any branch' do
-          result = subject
-
-          expect(result.count).to eq(0)
-        end
-      end
-
       context 'by provided names' do
         let(:params) { { names: %w[fix csv lfs does-not-exist] } }
 
@@ -115,6 +105,49 @@ RSpec.describe BranchesFinder do
         end
       end
 
+      context 'by name with wildcard' do
+        let(:params) { { search: 'f*e' } }
+
+        it 'filters branches' do
+          result = subject
+
+          expect(result.first.name).to eq('2-mb-file')
+          expect(result.count).to eq(30)
+        end
+      end
+
+      context 'by mixed regex operators' do
+        let(:params) { { search: '^f*e$' } }
+
+        it 'filters branches' do
+          result = subject
+
+          expect(result.first.name).to eq('feature')
+          expect(result.count).to eq(1)
+        end
+      end
+
+      context 'by name with multiple wildcards' do
+        let(:params) { { search: 'f*a*e' } }
+
+        it 'filters branches' do
+          result = subject
+
+          expect(result.first.name).to eq('after-create-delete-modify-move')
+          expect(result.count).to eq(11)
+        end
+      end
+
+      context 'with an unknown name' do
+        let(:params) { { search: 'random' } }
+
+        it 'does not find any branch' do
+          result = subject
+
+          expect(result.count).to eq(0)
+        end
+      end
+
       context 'by nonexistent name that begins with' do
         let(:params) { { search: '^nope' } }
 
@@ -134,6 +167,16 @@ RSpec.describe BranchesFinder do
           expect(result.count).to eq(0)
         end
       end
+
+      context 'by nonexistent name with wildcard' do
+        let(:params) { { search: 'zz*asdf' } }
+
+        it 'filters branches' do
+          result = subject
+
+          expect(result.count).to eq(0)
+        end
+      end
     end
 
     context 'filter and sort' do