Add latest changes from gitlab-org/gitlab@master

1 files changed, 38 insertions, 39 deletions

diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb
index d77a8f50cd1..db3c3010b76 100644
--- a/spec/models/repository_spec.rb
+++ b/spec/models/repository_spec.rb
@@ -1331,7 +1331,7 @@ RSpec.describe Repository do
     end
   end
 
-  describe '#license_key', :use_clean_rails_memory_store_caching do
+  describe '#license_key', :clean_gitlab_redis_cache do
     let(:project) { create(:project, :repository) }
 
     before do
@@ -1377,48 +1377,46 @@ RSpec.describe Repository do
     end
   end
 
-  describe '#license' do
-    let(:project) { create(:project, :repository) }
-
-    before do
-      repository.delete_file(user, 'LICENSE',
-        message: 'Remove LICENSE', branch_name: 'master')
-    end
+  [true, false].each do |ff|
+    context "with feature flag license_from_gitaly=#{ff}" do
+      before do
+        stub_feature_flags(license_from_gitaly: ff)
+      end
 
-    it 'returns nil when no license is detected' do
-      expect(repository.license).to be_nil
-    end
+      describe '#license', :clean_gitlab_redis_cache do
+        let(:project) { create(:project, :repository) }
 
-    it 'returns nil when the repository does not exist' do
-      expect(repository).to receive(:exists?).and_return(false)
+        before do
+          repository.delete_file(user, 'LICENSE',
+                                 message: 'Remove LICENSE', branch_name: 'master')
+        end
 
-      expect(repository.license).to be_nil
-    end
+        it 'returns nil when no license is detected' do
+          expect(repository.license).to be_nil
+        end
 
-    it 'returns nil when license_key is not recognized' do
-      expect(repository).to receive(:license_key).twice.and_return('not-recognized')
-      expect(Gitlab::ErrorTracking).to receive(:track_exception) do |ex|
-        expect(ex).to be_a(Licensee::InvalidLicense)
-      end
+        it 'returns nil when the repository does not exist' do
+          expect(repository).to receive(:exists?).and_return(false)
 
-      expect(repository.license).to be_nil
-    end
+          expect(repository.license).to be_nil
+        end
 
-    it 'returns other when the content is not recognizable' do
-      license = Licensee::License.new('other')
-      repository.create_file(user, 'LICENSE', 'Gitlab B.V.',
-        message: 'Add LICENSE', branch_name: 'master')
+        it 'returns other when the content is not recognizable' do
+          repository.create_file(user, 'LICENSE', 'Gitlab B.V.',
+                                 message: 'Add LICENSE', branch_name: 'master')
 
-      expect(repository.license).to eq(license)
-    end
+          expect(repository.license_key).to eq('other')
+        end
 
-    it 'returns the license' do
-      license = Licensee::License.new('mit')
-      repository.create_file(user, 'LICENSE',
-        license.content,
-        message: 'Add LICENSE', branch_name: 'master')
+        it 'returns the license' do
+          license = Licensee::License.new('mit')
+          repository.create_file(user, 'LICENSE',
+                                 license.content,
+                                 message: 'Add LICENSE', branch_name: 'master')
 
-      expect(repository.license).to eq(license)
+          expect(repository.license_key).to eq(license.key)
+        end
+      end
     end
   end
 
@@ -2207,7 +2205,8 @@ RSpec.describe Repository do
         :contribution_guide,
         :changelog,
         :license_blob,
-        :license_key,
+        :license_licensee,
+        :license_gitaly,
         :gitignore,
         :gitlab_ci_yml,
         :branch_names,
@@ -2695,7 +2694,7 @@ RSpec.describe Repository do
         match[1].to_sym if match
       end.compact
 
-      expect(Repository::CACHED_METHODS + Repository::MEMOIZED_CACHED_METHODS).to include(*methods)
+      expect(Repository::CACHED_METHODS).to include(*methods)
     end
   end
 
@@ -2860,12 +2859,12 @@ RSpec.describe Repository do
   describe '#refresh_method_caches' do
     it 'refreshes the caches of the given types' do
       expect(repository).to receive(:expire_method_caches)
-        .with(%i(readme_path license_blob license_key license))
+        .with(%i(readme_path license_blob license_licensee license_gitaly))
 
       expect(repository).to receive(:readme_path)
       expect(repository).to receive(:license_blob)
-      expect(repository).to receive(:license_key)
-      expect(repository).to receive(:license)
+      expect(repository).to receive(:license_licensee)
+      expect(repository).to receive(:license_gitaly)
 
       repository.refresh_method_caches(%i(readme license))
     end