Commit 6f0fc2b4 authored by Illya Klymov's avatar Illya Klymov

Merge branch...

Merge branch '9013-related-merge-request-spinner-on-commit-pipeline-page-spins-forever' into 'master'

Add missing function call that causes related merge requests spinner to never resolve

See merge request gitlab-org/gitlab!36077
parents ff479a15 58a7e8fb
import $ from 'jquery'; import $ from 'jquery';
import MiniPipelineGraph from '~/mini_pipeline_graph_dropdown'; import MiniPipelineGraph from '~/mini_pipeline_graph_dropdown';
import initPipelines from '~/commit/pipelines/pipelines_bundle'; import initPipelines from '~/commit/pipelines/pipelines_bundle';
import { fetchCommitMergeRequests } from '~/commit_merge_requests';
document.addEventListener('DOMContentLoaded', () => { document.addEventListener('DOMContentLoaded', () => {
new MiniPipelineGraph({ new MiniPipelineGraph({
...@@ -8,5 +9,6 @@ document.addEventListener('DOMContentLoaded', () => { ...@@ -8,5 +9,6 @@ document.addEventListener('DOMContentLoaded', () => {
}).bindEvents(); }).bindEvents();
// eslint-disable-next-line no-jquery/no-load // eslint-disable-next-line no-jquery/no-load
$('.commit-info.branches').load(document.querySelector('.js-commit-box').dataset.commitPath); $('.commit-info.branches').load(document.querySelector('.js-commit-box').dataset.commitPath);
fetchCommitMergeRequests();
initPipelines(); initPipelines();
}); });
---
title: Fix infinite loading spinner for related merge requests on commit pipelines
tab
merge_request: 36077
author:
type: fixed
...@@ -6,23 +6,32 @@ RSpec.describe 'project commit pipelines', :js do ...@@ -6,23 +6,32 @@ RSpec.describe 'project commit pipelines', :js do
let(:project) { create(:project, :repository) } let(:project) { create(:project, :repository) }
before do before do
create(:ci_pipeline, project: project,
sha: project.commit.sha,
ref: 'master')
user = create(:user) user = create(:user)
project.add_maintainer(user) project.add_maintainer(user)
sign_in(user) sign_in(user)
visit pipelines_project_commit_path(project, project.commit.sha)
end end
context 'when no builds triggered yet' do context 'when no builds triggered yet' do
before do it 'shows the ID of the first pipeline' do
create(:ci_pipeline, project: project, page.within('.table-holder') do
sha: project.commit.sha, expect(page).to have_content project.ci_pipelines[0].id # pipeline ids
ref: 'master') end
end end
end
it 'user views commit pipelines page' do context 'with no related merge requests' do
visit pipelines_project_commit_path(project, project.commit.sha) it 'shows the correct text for no related MRs' do
wait_for_requests
page.within('.table-holder') do page.within('.merge-request-info') do
expect(page).to have_content project.ci_pipelines[0].id # pipeline ids expect(page).not_to have_selector '.spinner'
expect(page).to have_content 'No related merge requests found'
end end
end end
end end
......
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