Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42

1 files changed, 17 insertions, 17 deletions

diff --git a/spec/features/runners_spec.rb b/spec/features/runners_spec.rb
index 5cddad81927..cc024ab8f35 100644
--- a/spec/features/runners_spec.rb
+++ b/spec/features/runners_spec.rb
@@ -19,7 +19,7 @@ RSpec.describe 'Runners' do
     it 'user can see a button to install runners on kubernetes clusters' do
       visit project_runners_path(project)
 
-      expect(page).to have_link('Install Runner on Kubernetes', href: project_clusters_path(project))
+      expect(page).to have_link('Install GitLab Runner on Kubernetes', href: project_clusters_path(project))
     end
   end
 
@@ -69,7 +69,7 @@ RSpec.describe 'Runners' do
         visit project_runners_path(project)
 
         within '.activated-specific-runners' do
-          click_on 'Remove Runner'
+          click_on 'Remove runner'
         end
 
         expect(page).not_to have_content(specific_runner.display_name)
@@ -226,10 +226,10 @@ RSpec.describe 'Runners' do
         it 'group runners are not available' do
           visit project_runners_path(project)
 
-          expect(page).to have_content 'This group does not provide any group Runners yet'
+          expect(page).to have_content 'This group does not have any group runners yet.'
 
-          expect(page).to have_content 'Group maintainers can register group runners in the Group CI/CD settings'
-          expect(page).not_to have_content 'Ask your group maintainer to set up a group Runner'
+          expect(page).to have_content 'Group maintainers can register group runners in the group\'s CI/CD settings.'
+          expect(page).not_to have_content 'Ask your group maintainer to set up a group runner'
         end
       end
     end
@@ -241,7 +241,7 @@ RSpec.describe 'Runners' do
         it 'group runners are not available' do
           visit project_runners_path(project)
 
-          expect(page).to have_content 'This project does not belong to a group and can therefore not make use of group Runners.'
+          expect(page).to have_content 'This project does not belong to a group and cannot make use of group runners.'
         end
       end
 
@@ -252,10 +252,10 @@ RSpec.describe 'Runners' do
         it 'group runners are not available' do
           visit project_runners_path(project)
 
-          expect(page).to have_content 'This group does not provide any group Runners yet.'
+          expect(page).to have_content 'This group does not have any group runners yet.'
 
-          expect(page).not_to have_content 'Group maintainers can register group runners in the Group CI/CD settings'
-          expect(page).to have_content 'Ask your group maintainer to set up a group Runner.'
+          expect(page).not_to have_content 'Group maintainers can register group runners in the group\'s CI/CD settings.'
+          expect(page).to have_content 'Ask your group maintainer to set up a group runner.'
         end
       end
 
@@ -267,21 +267,21 @@ RSpec.describe 'Runners' do
         it 'group runners are available' do
           visit project_runners_path(project)
 
-          expect(page).to have_content 'Available group Runners: 1'
+          expect(page).to have_content 'Available group runners: 1'
           expect(page).to have_content 'group-runner'
         end
 
         it 'group runners may be disabled for a project' do
           visit project_runners_path(project)
 
-          click_on 'Disable group Runners'
+          click_on 'Disable group runners'
 
-          expect(page).to have_content 'Enable group Runners'
+          expect(page).to have_content 'Enable group runners'
           expect(project.reload.group_runners_enabled).to be false
 
-          click_on 'Enable group Runners'
+          click_on 'Enable group runners'
 
-          expect(page).to have_content 'Disable group Runners'
+          expect(page).to have_content 'Disable group runners'
           expect(project.reload.group_runners_enabled).to be true
         end
       end
@@ -305,7 +305,7 @@ RSpec.describe 'Runners' do
       it 'user can see a link to install runners on kubernetes clusters' do
         visit group_settings_ci_cd_path(group)
 
-        expect(page).to have_link('Install Runner on Kubernetes', href: group_clusters_path(group))
+        expect(page).to have_link('Install GitLab Runner on Kubernetes', href: group_clusters_path(group))
       end
     end
 
@@ -316,7 +316,7 @@ RSpec.describe 'Runners' do
         visit group_settings_ci_cd_path(group)
 
         expect(page).not_to have_content 'No runners found'
-        expect(page).to have_content 'Available Runners: 1'
+        expect(page).to have_content 'Available runners: 1'
         expect(page).to have_content 'group-runner'
       end
 
@@ -396,7 +396,7 @@ RSpec.describe 'Runners' do
         visit group_settings_ci_cd_path(group)
 
         expect(page).not_to have_content 'No runners found'
-        expect(page).to have_content 'Available Runners: 1'
+        expect(page).to have_content 'Available runners: 1'
         expect(page).to have_content 'project-runner'
       end