From d5f5d147a14d67496027a1d58e35583c30756fe3 Mon Sep 17 00:00:00 2001 From: Michael Kozono Date: Thu, 7 Jun 2018 16:05:42 -0700 Subject: Rename method according to new role name --- qa/qa/factory/resource/branch.rb | 4 ++-- qa/qa/page/project/settings/protected_branches.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'qa') diff --git a/qa/qa/factory/resource/branch.rb b/qa/qa/factory/resource/branch.rb index 20c3f7e6d24..4cabe7eab45 100644 --- a/qa/qa/factory/resource/branch.rb +++ b/qa/qa/factory/resource/branch.rb @@ -64,13 +64,13 @@ module QA page.select_branch(branch_name) if allow_to_push - page.allow_devs_and_masters_to_push + page.allow_devs_and_maintainers_to_push else page.allow_no_one_to_push end if allow_to_merge - page.allow_devs_and_masters_to_merge + page.allow_devs_and_maintainers_to_merge else page.allow_no_one_to_merge end diff --git a/qa/qa/page/project/settings/protected_branches.rb b/qa/qa/page/project/settings/protected_branches.rb index d5da0091976..0bd031e96b5 100644 --- a/qa/qa/page/project/settings/protected_branches.rb +++ b/qa/qa/page/project/settings/protected_branches.rb @@ -40,7 +40,7 @@ module QA click_allow(:push, 'No one') end - def allow_devs_and_masters_to_push + def allow_devs_and_maintainers_to_push click_allow(:push, 'Developers + Maintainers') end @@ -48,7 +48,7 @@ module QA click_allow(:merge, 'No one') end - def allow_devs_and_masters_to_merge + def allow_devs_and_maintainers_to_merge click_allow(:merge, 'Developers + Maintainers') end -- cgit v1.2.1