3 files changed, 26 insertions, 17 deletions
diff --git a/spec/features/search/user_searches_for_wiki_pages_spec.rb b/spec/features/search/user_searches_for_wiki_pages_spec.rb
index 3ee753b7d23..7225ca65492 100644
--- a/spec/features/search/user_searches_for_wiki_pages_spec.rb
+++ b/spec/features/search/user_searches_for_wiki_pages_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe 'User searches for wiki pages', :js do
   let(:user) { create(:user) }
-  let(:project) { create(:project, :wiki_repo, namespace: user.namespace) }
+  let(:project) { create(:project, :repository, :wiki_repo, namespace: user.namespace) }
   let!(:wiki_page) { create(:wiki_page, wiki: project.wiki, attrs: { title: 'test_wiki', content: 'Some Wiki content' }) }
 
   before do
diff --git a/spec/models/blob_spec.rb b/spec/models/blob_spec.rb
index da3b29dffb6..81e35e6c931 100644
--- a/spec/models/blob_spec.rb
+++ b/spec/models/blob_spec.rb
@@ -224,22 +224,6 @@ describe Blob do
     end
   end
 
-  describe '#language_from_gitattributes' do
-    subject(:blob) { fake_blob(path: 'file.md') }
-
-    it 'returns return value from gitattribute' do
-      expect(blob.project.repository).to receive(:gitattribute).with(blob.path, 'gitlab-language').and_return('erb?parent=json')
-
-      expect(blob.language_from_gitattributes).to eq('erb?parent=json')
-    end
-
-    it 'returns nil if project is absent' do
-      allow(blob).to receive(:project).and_return(nil)
-
-      expect(blob.language_from_gitattributes).to eq(nil)
-    end
-  end
-
   describe '#simple_viewer' do
     context 'when the blob is empty' do
       it 'returns an empty viewer' do
diff --git a/spec/models/concerns/blob_language_from_git_attributes_spec.rb b/spec/models/concerns/blob_language_from_git_attributes_spec.rb
new file mode 100644
index 00000000000..7f05073b08e
--- /dev/null
+++ b/spec/models/concerns/blob_language_from_git_attributes_spec.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe BlobLanguageFromGitAttributes do
+  include FakeBlobHelpers
+
+  let(:project) { build(:project, :repository) }
+
+  describe '#language_from_gitattributes' do
+    subject(:blob) { fake_blob(path: 'file.md') }
+
+    it 'returns return value from gitattribute' do
+      expect(blob.project.repository).to receive(:gitattribute).with(blob.path, 'gitlab-language').and_return('erb?parent=json')
+
+      expect(blob.language_from_gitattributes).to eq('erb?parent=json')
+    end
+
+    it 'returns nil if project is absent' do
+      allow(blob).to receive(:project).and_return(nil)
+
+      expect(blob.language_from_gitattributes).to eq(nil)
+    end
+  end
+end