Add latest changes from gitlab-org/gitlab@master

1 files changed, 19 insertions, 1 deletions

diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb
index 8b62e332407..845c906129f 100644
--- a/spec/models/repository_spec.rb
+++ b/spec/models/repository_spec.rb
@@ -1817,10 +1817,28 @@ describe Repository do
   end
 
   describe '#after_import' do
+    subject { repository.after_import }
+
     it 'flushes and builds the cache' do
       expect(repository).to receive(:expire_content_cache)
 
-      repository.after_import
+      subject
+    end
+
+    it 'calls DetectRepositoryLanguagesWorker' do
+      expect(DetectRepositoryLanguagesWorker).to receive(:perform_async)
+
+      subject
+    end
+
+    context 'with a wiki repository' do
+      let(:repository) { project.wiki.repository }
+
+      it 'does not call DetectRepositoryLanguagesWorker' do
+        expect(DetectRepositoryLanguagesWorker).not_to receive(:perform_async)
+
+        subject
+      end
     end
   end