fix: slug_regex when url has different host

prontolabs · Mar 11, 2022 · fae60ca · fae60ca
1 parent a84f946
commit fae60ca
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/lib/pronto/gitlab.rb b/lib/pronto/gitlab.rb
@@ -87,8 +87,10 @@ def env_pull_id
     def slug_regex(url)
       if url =~ %r{^ssh:\/\/}
         %r{.*#{host}(:[0-9]+)?(:|\/)(?<slug>.*).git}
-      else
+      elsif url =~ %r{#{host}}
         %r{.*#{host}(:|\/)(?<slug>.*).git}
+      else
+        %r{\/\/.*?(\/)(?<slug>.*).git}
       end
     end
 

diff --git a/spec/pronto/gitlab_spec.rb b/spec/pronto/gitlab_spec.rb
@@ -29,6 +29,26 @@ module Pronto
           subject.should eql('prontolabs/pronto')
         end
       end
+
+      context 'http remote url' do
+        let(:repo) do
+          double(remote_urls: ['https://gitlab.example.com/prontolabs/pronto.git'])
+        end
+
+        it 'returns correct slug' do
+          subject.should eql('prontolabs/pronto')
+        end
+      end
+
+      context 'http remote url with different host' do
+        let(:repo) do
+          double(remote_urls: ['https://gitlab.example.net/prontolabs/pronto.git'])
+        end
+
+        it 'returns correct slug' do
+          subject.should eql('prontolabs/pronto')
+        end
+      end
     end
 
     describe '#commit_comments' do