Merge branch 'id-fix-submodule-links-for-refs-with-dashes' into 'master'

Fix caching of submodule links for shas with dashes

See merge request !18576

lib/gitlab/submodule_links.rb

@@ -6,6 +6,7 @@ class SubmoduleLinks
 
     def initialize(repository)
       @repository = repository
+      @cache_store = {}
     end
 
     def for(submodule, sha)
@@ -18,8 +19,9 @@ def for(submodule, sha)
     attr_reader :repository
 
     def submodule_urls_for(sha)
-      strong_memoize(:"submodule_urls_for_#{sha}") do
-        repository.submodule_urls_for(sha)
+      @cache_store.fetch(sha) do
+        submodule_urls = repository.submodule_urls_for(sha)
+        @cache_store[sha] = submodule_urls
       end
     end
 

spec/lib/gitlab/submodule_links_spec.rb

@@ -8,7 +8,9 @@
   let(:links) { described_class.new(repo) }
 
   describe '#for' do
-    subject { links.for(submodule_item, 'ref') }
+    let(:ref) { 'ref' }
+
+    subject { links.for(submodule_item, ref) }
 
     context 'when there is no .gitmodules file' do
       before do
@@ -35,8 +37,20 @@
         stub_urls({ 'gitlab-foss' => 'git@gitlab.com:gitlab-org/gitlab-foss.git' })
       end
 
-      it 'returns links' do
+      it 'returns links and caches the by ref' do
         expect(subject).to eq(['https://gitlab.com/gitlab-org/gitlab-foss', 'https://gitlab.com/gitlab-org/gitlab-foss/tree/hash'])
+
+        cache_store = links.instance_variable_get("@cache_store")
+
+        expect(cache_store[ref]).to eq({ "gitlab-foss" => "git@gitlab.com:gitlab-org/gitlab-foss.git" })
+      end
+
+      context 'when ref name contains a dash' do
+        let(:ref) { 'signed-commits' }
+
+        it 'returns links' do
+          expect(subject).to eq(['https://gitlab.com/gitlab-org/gitlab-foss', 'https://gitlab.com/gitlab-org/gitlab-foss/tree/hash'])
+        end
       end
     end
   end