Commit fab3df77 authored by Shinya Maeda's avatar Shinya Maeda

Fix tests

parent 438e18d8
...@@ -10,11 +10,14 @@ feature 'Runners' do ...@@ -10,11 +10,14 @@ feature 'Runners' do
context 'when a project has enabled shared_runners' do context 'when a project has enabled shared_runners' do
given(:project) { create(:project) } given(:project) { create(:project) }
background do
project.add_master(user)
end
context 'when a specific runner is activated on the project' do context 'when a specific runner is activated on the project' do
given(:specific_runner) { create(:ci_runner, :specific) } given(:specific_runner) { create(:ci_runner, :specific) }
background do background do
project.add_master(user)
project.runners << specific_runner project.runners << specific_runner
end end
...@@ -30,19 +33,19 @@ feature 'Runners' do ...@@ -30,19 +33,19 @@ feature 'Runners' do
expect(page).to have_content(specific_runner.platform) expect(page).to have_content(specific_runner.platform)
end end
scenario 'user removes an activated specific runner' do scenario 'user removes an activated specific runner if this is last project for that runners' do
visit runners_path(project) visit runners_path(project)
within '.activated-specific-runners' do within '.activated-specific-runners' do
click_on 'Remove Runner' click_on 'Remove Runner'
end end
expect(page).to have_no_css('.activated-specific-runners') expect(page).not_to have_content(specific_runner.display_name)
end end
context 'when a runner has a tag' do context 'when a runner has a tag' do
background do background do
specific_runner.update_attribute(:tag_list, ['tag']) specific_runner.update(tag_list: ['tag'])
end end
scenario 'user edits runner not to run untagged jobs' do scenario 'user edits runner not to run untagged jobs' do
...@@ -61,40 +64,40 @@ feature 'Runners' do ...@@ -61,40 +64,40 @@ feature 'Runners' do
end end
end end
context 'when a specific runner exists in another project' do context 'when a shared runner is activated on the project' do
given(:another_project) { create(:project) } given!(:shared_runner) { create(:ci_runner, :shared) }
given(:specific_runner2) { create(:ci_runner, :specific) }
background do
another_project.add_master(user)
another_project.runners << specific_runner2
end
scenario 'user enables and disables a specific runner' do scenario 'user sees CI/CD setting page' do
visit runners_path(project) visit runners_path(project)
within '.available-specific-runners' do expect(page.find('.available-shared-runners')).to have_content(shared_runner.display_name)
click_on 'Enable for this project' end
end end
end
expect(page.find('.activated-specific-runners')).to have_content(specific_runner2.display_name)
within '.activated-specific-runners' do context 'when a specific runner exists in another project' do
click_on 'Disable for this project' given(:another_project) { create(:project) }
end given(:specific_runner) { create(:ci_runner, :specific) }
expect(page.find('.activated-specific-runners')).not_to have_content(specific_runner2.display_name) background do
end another_project.add_master(user)
another_project.runners << specific_runner
end end
context 'when a shared runner is activated on the project' do scenario 'user enables and disables a specific runner' do
given!(:shared_runner) { create(:ci_runner, :shared) } visit runners_path(project)
scenario 'user sees CI/CD setting page' do within '.available-specific-runners' do
visit runners_path(project) click_on 'Enable for this project'
end
expect(page.find('.available-shared-runners')).to have_content(shared_runner.display_name) expect(page.find('.activated-specific-runners')).to have_content(specific_runner.display_name)
within '.activated-specific-runners' do
click_on 'Disable for this project'
end end
expect(page.find('.available-specific-runners')).to have_content(specific_runner.display_name)
end end
end end
...@@ -103,7 +106,6 @@ feature 'Runners' do ...@@ -103,7 +106,6 @@ feature 'Runners' do
given(:shared_runners_html) { 'custom shared runners description' } given(:shared_runners_html) { 'custom shared runners description' }
background do background do
project.add_master(user)
stub_application_setting(shared_runners_text: shared_runners_text) stub_application_setting(shared_runners_text: shared_runners_text)
end end
...@@ -126,6 +128,7 @@ feature 'Runners' do ...@@ -126,6 +128,7 @@ feature 'Runners' do
visit runners_path(project) visit runners_path(project)
click_on 'Enable shared Runners' click_on 'Enable shared Runners'
expect(page.find('.shared-runners-description')).to have_content('Disable shared Runners') expect(page.find('.shared-runners-description')).to have_content('Disable shared Runners')
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