Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'spec/features/ci/runners_spec.rb')
-rw-r--r--spec/features/ci/runners_spec.rb28
1 files changed, 14 insertions, 14 deletions
diff --git a/spec/features/ci/runners_spec.rb b/spec/features/ci/runners_spec.rb
index 8eea0c4441f..86ccac29c74 100644
--- a/spec/features/ci/runners_spec.rb
+++ b/spec/features/ci/runners_spec.rb
@@ -7,8 +7,8 @@ describe "Runners" do
describe "specific runners" do
before do
- @project = FactoryGirl.create :project
- @project2 = FactoryGirl.create :project
+ @project = FactoryGirl.create :ci_project
+ @project2 = FactoryGirl.create :ci_project
stub_js_gitlab_calls
# all projects should be authorized for user
@@ -17,22 +17,22 @@ describe "Runners" do
OpenStruct.new({ id: @project2.gitlab_id })
])
- @shared_runner = FactoryGirl.create :shared_runner
- @specific_runner = FactoryGirl.create :specific_runner
- @specific_runner2 = FactoryGirl.create :specific_runner
+ @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 project_runners_path(@project)
+ 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 project_runners_path(@project)
+ visit ci_project_runners_path(@project)
within ".available-specific-runners" do
click_on "Enable for this project"
@@ -44,7 +44,7 @@ describe "Runners" do
it "disables specific runner for project" do
@project2.runners << @specific_runner
- visit project_runners_path(@project)
+ visit ci_project_runners_path(@project)
within ".activated-specific-runners" do
click_on "Disable for this project"
@@ -54,7 +54,7 @@ describe "Runners" do
end
it "removes specific runner for project if this is last project for that runners" do
- visit project_runners_path(@project)
+ visit ci_project_runners_path(@project)
within ".activated-specific-runners" do
click_on "Remove runner"
@@ -66,12 +66,12 @@ describe "Runners" do
describe "shared runners" do
before do
- @project = FactoryGirl.create :project
+ @project = FactoryGirl.create :ci_project
stub_js_gitlab_calls
end
it "enables shared runners" do
- visit project_runners_path(@project)
+ visit ci_project_runners_path(@project)
click_on "Enable shared runners"
@@ -81,14 +81,14 @@ describe "Runners" do
describe "show page" do
before do
- @project = FactoryGirl.create :project
+ @project = FactoryGirl.create :ci_project
stub_js_gitlab_calls
- @specific_runner = FactoryGirl.create :specific_runner
+ @specific_runner = FactoryGirl.create :ci_specific_runner
@project.runners << @specific_runner
end
it "shows runner information" do
- visit project_runners_path(@project)
+ visit ci_project_runners_path(@project)
click_on @specific_runner.short_sha