summaryrefslogtreecommitdiff
path: root/qa
diff options
context:
space:
mode:
authorMichael Kozono <mkozono@gmail.com>2018-05-24 14:36:08 -0700
committerMichael Kozono <mkozono@gmail.com>2018-06-08 09:05:06 -0700
commit6f3c744d4276d5e08e56dcfe5b3cdf27daba8587 (patch)
tree661aac9888446f875c78a9422afad516f1d205b3 /qa
parentcaaaffde69b35e948fa10ad27f88260de741a340 (diff)
downloadgitlab-ce-6f3c744d4276d5e08e56dcfe5b3cdf27daba8587.tar.gz
Fix protected branch fabrication
Diffstat (limited to 'qa')
-rw-r--r--qa/qa/factory/resource/branch.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/qa/qa/factory/resource/branch.rb b/qa/qa/factory/resource/branch.rb
index 2a3e8e81571..20c3f7e6d24 100644
--- a/qa/qa/factory/resource/branch.rb
+++ b/qa/qa/factory/resource/branch.rb
@@ -84,6 +84,11 @@ module QA
# Avoid Selenium::WebDriver::Error::StaleElementReferenceError
# without sleeping. I.e. this completes fast on fast machines.
page.refresh
+
+ # It is possible for the protected branch row to "disappear" at first
+ page.wait do
+ page.has_content?(branch_name)
+ end
end
end
end