Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
52e2eda3
Commit
52e2eda3
authored
May 30, 2019
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
31b52757
02926eea
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
4 deletions
+6
-4
qa/qa/page/project/branches/show.rb
qa/qa/page/project/branches/show.rb
+5
-3
qa/qa/specs/features/browser_ui/3_create/repository/add_list_delete_branches_spec.rb
...r_ui/3_create/repository/add_list_delete_branches_spec.rb
+1
-1
No files found.
qa/qa/page/project/branches/show.rb
View file @
52e2eda3
...
...
@@ -28,9 +28,11 @@ module QA
finished_loading?
end
def
has_no_branch?
(
branch_name
)
within_element
(
:all_branches
)
do
has_no_element?
(
:branch_name
,
text:
branch_name
,
wait:
Support
::
Waiter
::
DEFAULT_MAX_WAIT_TIME
)
def
has_no_branch?
(
branch_name
,
reload:
false
)
wait
(
reload:
reload
)
do
within_element
(
:all_branches
)
do
has_no_element?
(
:branch_name
,
text:
branch_name
)
end
end
end
...
...
qa/qa/specs/features/browser_ui/3_create/repository/add_list_delete_branches_spec.rb
View file @
52e2eda3
...
...
@@ -84,7 +84,7 @@ module QA
page
.
refresh
Page
::
Project
::
Branches
::
Show
.
perform
do
|
branches_view
|
expect
(
branches_view
).
to
have_no_branch
(
second_branch
)
expect
(
branches_view
).
to
have_no_branch
(
second_branch
,
reload:
true
)
end
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment