Skip to content
Snippets Groups Projects
Unverified Commit 92f8e0fd authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Finish move of runners page to project settings

parent b328c76c
No related branches found
No related tags found
Loading
Pipeline #
Loading
@@ -12,6 +12,7 @@ v 8.1.0 (unreleased)
Loading
@@ -12,6 +12,7 @@ v 8.1.0 (unreleased)
- Show CI status on Your projects page and Starred projects page - Show CI status on Your projects page and Starred projects page
- Remove "Continuous Integration" page from dashboard - Remove "Continuous Integration" page from dashboard
- Add notes and SSL verification entries to hook APIs (Ben Boeckel) - Add notes and SSL verification entries to hook APIs (Ben Boeckel)
- Move CI runners page to project settings area
   
v 8.0.2 (unreleased) v 8.0.2 (unreleased)
- Fix default avatar not rendering in network graph (Stan Hu) - Fix default avatar not rendering in network graph (Stan Hu)
Loading
Loading
Loading
@@ -3,7 +3,7 @@
Loading
@@ -3,7 +3,7 @@
- if current_user && can?(current_user, :manage_project, gl_project) && !@project.any_runners? - if current_user && can?(current_user, :manage_project, gl_project) && !@project.any_runners?
.alert.alert-danger .alert.alert-danger
Builds for this project wont be served unless you configure runners on Builds for this project wont be served unless you configure runners on
= link_to "Runners page", ci_project_runners_path(@project) = link_to "Runners page", runners_path(@project.gl_project)
   
%ul.nav.nav-tabs.append-bottom-20 %ul.nav.nav-tabs.append-bottom-20
%li{class: ref_tab_class} %li{class: ref_tab_class}
Loading
Loading
Loading
@@ -4,7 +4,7 @@
Loading
@@ -4,7 +4,7 @@
%ol %ol
%li %li
Add at least one runner to the project. Add at least one runner to the project.
Go to #{link_to 'Runners page', ci_project_runners_path(@project), target: :blank} for instructions. Go to #{link_to 'Runners page', runners_path(@project.gl_project), target: :blank} for instructions.
%li %li
Put the .gitlab-ci.yml in the root of your repository. Examples can be found in #{link_to "Configuring project (.gitlab-ci.yml)", "http://doc.gitlab.com/ci/yaml/README.html", target: :blank}. Put the .gitlab-ci.yml in the root of your repository. Examples can be found in #{link_to "Configuring project (.gitlab-ci.yml)", "http://doc.gitlab.com/ci/yaml/README.html", target: :blank}.
You can also test your .gitlab-ci.yml in the #{link_to "Lint", ci_lint_path} You can also test your .gitlab-ci.yml in the #{link_to "Lint", ci_lint_path}
Loading
Loading
require 'spec_helper'
describe "Runners" do
let(:user) { create(:user) }
before do
login_as(user)
end
describe "specific runners" do
before do
@project = FactoryGirl.create :ci_project
@project.gl_project.team << [user, :master]
@project2 = FactoryGirl.create :ci_project
@project2.gl_project.team << [user, :master]
@shared_runner = FactoryGirl.create :ci_shared_runner
@specific_runner = FactoryGirl.create :ci_specific_runner
@specific_runner2 = FactoryGirl.create :ci_specific_runner
@project.runners << @specific_runner
@project2.runners << @specific_runner2
end
it "places runners in right places" do
visit ci_project_runners_path(@project)
expect(page.find(".available-specific-runners")).to have_content(@specific_runner2.display_name)
expect(page.find(".activated-specific-runners")).to have_content(@specific_runner.display_name)
expect(page.find(".available-shared-runners")).to have_content(@shared_runner.display_name)
end
it "enables specific runner for project" do
visit ci_project_runners_path(@project)
within ".available-specific-runners" do
click_on "Enable for this project"
end
expect(page.find(".activated-specific-runners")).to have_content(@specific_runner2.display_name)
end
it "disables specific runner for project" do
@project2.runners << @specific_runner
visit ci_project_runners_path(@project)
within ".activated-specific-runners" do
click_on "Disable for this project"
end
expect(page.find(".available-specific-runners")).to have_content(@specific_runner.display_name)
end
it "removes specific runner for project if this is last project for that runners" do
visit ci_project_runners_path(@project)
within ".activated-specific-runners" do
click_on "Remove runner"
end
expect(Ci::Runner.exists?(id: @specific_runner)).to be_falsey
end
end
describe "shared runners" do
before do
@project = FactoryGirl.create :ci_project
@project.gl_project.team << [user, :master]
end
it "enables shared runners" do
visit ci_project_runners_path(@project)
click_on "Enable shared runners"
expect(@project.reload.shared_runners_enabled).to be_truthy
end
end
describe "show page" do
before do
@project = FactoryGirl.create :ci_project
@project.gl_project.team << [user, :master]
@specific_runner = FactoryGirl.create :ci_specific_runner
@project.runners << @specific_runner
end
it "shows runner information" do
visit ci_project_runners_path(@project)
click_on @specific_runner.short_sha
expect(page).to have_content(@specific_runner.platform)
end
end
end
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment