Commit dd3c2f30 authored by Phil Hughes's avatar Phil Hughes

Merge branch 'mrincon-fix-all-count' into 'master'

Fix runner count when tabs are used

See merge request gitlab-org/gitlab!78706
parents 725660cd 0805e28d
...@@ -99,7 +99,10 @@ export default { ...@@ -99,7 +99,10 @@ export default {
allRunnersCount: { allRunnersCount: {
...runnersCountSmartQuery, ...runnersCountSmartQuery,
variables() { variables() {
return this.countVariables; return {
...this.countVariables,
type: null,
};
}, },
}, },
instanceRunnersCount: { instanceRunnersCount: {
......
...@@ -254,6 +254,18 @@ RSpec.describe "Admin Runners" do ...@@ -254,6 +254,18 @@ RSpec.describe "Admin Runners" do
expect(page).not_to have_content 'runner-group' expect(page).not_to have_content 'runner-group'
end end
it 'show the same counts after selecting another tab' do
visit admin_runners_path
page.within('[data-testid="runner-type-tabs"]') do
click_on('Project')
expect(page).to have_link('All 2')
expect(page).to have_link('Group 1')
expect(page).to have_link('Project 1')
end
end
it 'shows no runner when type does not match' do it 'shows no runner when type does not match' do
visit admin_runners_path visit admin_runners_path
......
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