summaryrefslogtreecommitdiff
path: root/spec/features
diff options
context:
space:
mode:
authorMark Chao <mchao@gitlab.com>2018-06-04 10:32:57 +0900
committerMark Chao <mchao@gitlab.com>2018-06-06 21:01:45 +0900
commit748f8fef457f2795ab2592bf6041055cf613bb10 (patch)
tree1f301095c51edb3f26db6f43dc84d6626ddeed0c /spec/features
parenta6c15c5b9750b3b6b16694974eab868a21b8683a (diff)
downloadgitlab-ce-748f8fef457f2795ab2592bf6041055cf613bb10.tar.gz
group runners
Diffstat (limited to 'spec/features')
-rw-r--r--spec/features/runners_spec.rb12
1 files changed, 6 insertions, 6 deletions
diff --git a/spec/features/runners_spec.rb b/spec/features/runners_spec.rb
index 9ce7d538004..fe0b03a7e00 100644
--- a/spec/features/runners_spec.rb
+++ b/spec/features/runners_spec.rb
@@ -184,7 +184,7 @@ feature 'Runners' do
given(:group) { create :group }
- context 'as project and group master' do
+ context 'as project and group maintainer' do
background do
group.add_master(user)
end
@@ -197,13 +197,13 @@ feature 'Runners' do
expect(page).to have_content 'This group does not provide any group Runners yet'
- expect(page).to have_content 'Group masters can register group runners in the Group CI/CD settings'
- expect(page).not_to have_content 'Ask your group master to setup a group Runner'
+ 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 setup a group Runner'
end
end
end
- context 'as project master' do
+ context 'as project maintainer' do
context 'project without a group' do
given(:project) { create :project }
@@ -223,8 +223,8 @@ feature 'Runners' do
expect(page).to have_content 'This group does not provide any group Runners yet.'
- expect(page).not_to have_content 'Group masters can register group runners in the Group CI/CD settings'
- expect(page).to have_content 'Ask your group master to setup a group Runner.'
+ 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 setup a group Runner.'
end
end