Commit 8c7a88d6 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch '33846-no-runner-for-admin' into 'master'

Add explicit message when no runners on admin

Closes #33846

See merge request !12266
parents db8ad863 102a1774
......@@ -58,20 +58,23 @@
%br
.table-holder
%table.table
%thead
%tr
%th Type
%th Runner token
%th Description
%th Version
%th Projects
%th Jobs
%th Tags
%th Last contact
%th
- if @runners.any?
.table-holder
%table.table
%thead
%tr
%th Type
%th Runner token
%th Description
%th Version
%th Projects
%th Jobs
%th Tags
%th Last contact
%th
- @runners.each do |runner|
= render "admin/runners/runner", runner: runner
= paginate @runners, theme: "gitlab"
- @runners.each do |runner|
= render "admin/runners/runner", runner: runner
= paginate @runners, theme: "gitlab"
- else
.nothing-here-block No runners found
---
title: Add explicit message when no runners on admin
merge_request: 12266
author: Takuya Noguchi
......@@ -9,31 +9,54 @@ describe "Admin Runners" do
end
describe "Runners page" do
before do
runner = FactoryGirl.create(:ci_runner, contacted_at: Time.now)
pipeline = FactoryGirl.create(:ci_pipeline)
FactoryGirl.create(:ci_build, pipeline: pipeline, runner_id: runner.id)
visit admin_runners_path
end
let(:pipeline) { create(:ci_pipeline) }
context "when there are runners" do
before do
runner = FactoryGirl.create(:ci_runner, contacted_at: Time.now)
FactoryGirl.create(:ci_build, pipeline: pipeline, runner_id: runner.id)
visit admin_runners_path
end
it 'has all necessary texts' do
expect(page).to have_text "To register a new Runner"
expect(page).to have_text "Runners with last contact more than a minute ago: 1"
end
describe 'search' do
before do
FactoryGirl.create :ci_runner, description: 'runner-foo'
FactoryGirl.create :ci_runner, description: 'runner-bar'
end
it 'shows correct runner when description matches' do
search_form = find('#runners-search')
search_form.fill_in 'search', with: 'runner-foo'
search_form.click_button 'Search'
expect(page).to have_content("runner-foo")
expect(page).not_to have_content("runner-bar")
end
it 'shows no runner when description does not match' do
search_form = find('#runners-search')
search_form.fill_in 'search', with: 'runner-baz'
search_form.click_button 'Search'
it 'has all necessary texts' do
expect(page).to have_text "To register a new Runner"
expect(page).to have_text "Runners with last contact more than a minute ago: 1"
expect(page).to have_text 'No runners found'
end
end
end
describe 'search' do
context "when there are no runners" do
before do
FactoryGirl.create :ci_runner, description: 'runner-foo'
FactoryGirl.create :ci_runner, description: 'runner-bar'
search_form = find('#runners-search')
search_form.fill_in 'search', with: 'runner-foo'
search_form.click_button 'Search'
visit admin_runners_path
end
it 'shows correct runner' do
expect(page).to have_content("runner-foo")
expect(page).not_to have_content("runner-bar")
it 'has all necessary texts including no runner message' do
expect(page).to have_text "To register a new Runner"
expect(page).to have_text "Runners with last contact more than a minute ago: 0"
expect(page).to have_text 'No runners found'
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