summaryrefslogtreecommitdiff
path: root/qa/qa/page/project/settings/protected_branches.rb
diff options
context:
space:
mode:
Diffstat (limited to 'qa/qa/page/project/settings/protected_branches.rb')
-rw-r--r--qa/qa/page/project/settings/protected_branches.rb12
1 files changed, 4 insertions, 8 deletions
diff --git a/qa/qa/page/project/settings/protected_branches.rb b/qa/qa/page/project/settings/protected_branches.rb
index 63bc3aaa2bc..0bd031e96b5 100644
--- a/qa/qa/page/project/settings/protected_branches.rb
+++ b/qa/qa/page/project/settings/protected_branches.rb
@@ -40,16 +40,16 @@ module QA
click_allow(:push, 'No one')
end
- def allow_devs_and_masters_to_push
- click_allow(:push, 'Developers + Masters')
+ def allow_devs_and_maintainers_to_push
+ click_allow(:push, 'Developers + Maintainers')
end
def allow_no_one_to_merge
click_allow(:merge, 'No one')
end
- def allow_devs_and_masters_to_merge
- click_allow(:merge, 'Developers + Masters')
+ def allow_devs_and_maintainers_to_merge
+ click_allow(:merge, 'Developers + Maintainers')
end
def protect_branch
@@ -75,10 +75,6 @@ module QA
within_element(:"allowed_to_#{action}_dropdown") do
click_on text
-
- wait(reload: false) do
- has_css?('.is-active')
- end
end
end
end