Commit 1888b8a4 authored by Natalia Tepluhina's avatar Natalia Tepluhina

Merge branch...

Merge branch '37725-pipeline-junit-view-performance-on-running-on-big-data-set-load-async' into 'master'

Load test badge counter asynchronously

See merge request gitlab-org/gitlab!24522
parents 6bfe46fe d15cce39
...@@ -10,6 +10,7 @@ import pipelineHeader from './components/header_component.vue'; ...@@ -10,6 +10,7 @@ import pipelineHeader from './components/header_component.vue';
import eventHub from './event_hub'; import eventHub from './event_hub';
import TestReports from './components/test_reports/test_reports.vue'; import TestReports from './components/test_reports/test_reports.vue';
import testReportsStore from './stores/test_reports'; import testReportsStore from './stores/test_reports';
import axios from '~/lib/utils/axios_utils';
Vue.use(Translate); Vue.use(Translate);
...@@ -111,5 +112,12 @@ export default () => { ...@@ -111,5 +112,12 @@ export default () => {
return createElement('test-reports'); return createElement('test-reports');
}, },
}); });
axios
.get(dataset.testReportEndpoint)
.then(({ data }) => {
document.querySelector('.js-test-report-badge-counter').innerHTML = data.total_count;
})
.catch(() => {});
} }
}; };
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
%li.js-tests-tab-link %li.js-tests-tab-link
= link_to test_report_project_pipeline_path(@project, @pipeline), data: { target: '#js-tab-tests', action: 'test_report', toggle: 'tab' }, class: 'test-tab' do = link_to test_report_project_pipeline_path(@project, @pipeline), data: { target: '#js-tab-tests', action: 'test_report', toggle: 'tab' }, class: 'test-tab' do
= s_('TestReports|Tests') = s_('TestReports|Tests')
%span.badge.badge-pill= pipeline.test_reports.total_count %span.badge.badge-pill.js-test-report-badge-counter
= render_if_exists "projects/pipelines/tabs_holder", pipeline: @pipeline, project: @project = render_if_exists "projects/pipelines/tabs_holder", pipeline: @pipeline, project: @project
.tab-content .tab-content
......
...@@ -356,6 +356,18 @@ describe 'Pipeline', :js do ...@@ -356,6 +356,18 @@ describe 'Pipeline', :js do
end end
end end
context 'test tabs' do
let(:pipeline) { create(:ci_pipeline, :with_test_reports, project: project) }
it 'shows badge counter in Tests tab' do
visit_pipeline
wait_for_requests
expect(pipeline.test_reports.total_count).to eq(4)
expect(page.find('.js-test-report-badge-counter').text).to eq(pipeline.test_reports.total_count.to_s)
end
end
context 'retrying jobs' do context 'retrying jobs' do
before do before do
visit_pipeline visit_pipeline
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment