Merge branch 'zj-load-languages-from-database' into 'master'

Load repository language from the DB if detected

Closes #47390

See merge request gitlab-org/gitlab-ce!25518

1 files changed, 16 insertions, 0 deletions

diff --git a/spec/controllers/projects/graphs_controller_spec.rb b/spec/controllers/projects/graphs_controller_spec.rb
index 73fb7307e11..8decd8f1382 100644
--- a/spec/controllers/projects/graphs_controller_spec.rb
+++ b/spec/controllers/projects/graphs_controller_spec.rb
@@ -24,4 +24,20 @@ describe Projects::GraphsController do
       expect(response).to redirect_to action: :charts
     end
   end
+
+  describe 'charts' do
+    context 'when languages were previously detected' do
+      let!(:repository_language) { create(:repository_language, project: project) }
+
+      it 'sets the languages properly' do
+        get(:charts, params: { namespace_id: project.namespace.path, project_id: project.path, id: 'master' })
+
+        expect(assigns[:languages]).to eq(
+          [value: repository_language.share,
+           label: repository_language.name,
+           color: repository_language.color,
+           highlight: repository_language.color])
+      end
+    end
+  end
 end