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
e5b38d27
Commit
e5b38d27
authored
Mar 12, 2020
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix two flaky specs that didn't wait for the MR widget to load
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
b9ec8706
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
0 deletions
+6
-0
spec/features/discussion_comments/merge_request_spec.rb
spec/features/discussion_comments/merge_request_spec.rb
+3
-0
spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb
.../user_resolves_diff_notes_and_discussions_resolve_spec.rb
+3
-0
No files found.
spec/features/discussion_comments/merge_request_spec.rb
View file @
e5b38d27
...
...
@@ -12,6 +12,9 @@ describe 'Thread Comments Merge Request', :js do
sign_in
(
user
)
visit
project_merge_request_path
(
project
,
merge_request
)
# Wait for MR widget to load
wait_for_requests
end
it_behaves_like
'thread comments'
,
'merge request'
...
...
spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb
View file @
e5b38d27
...
...
@@ -568,5 +568,8 @@ describe 'Merge request > User resolves diff notes and threads', :js do
def
visit_merge_request
(
mr
=
nil
)
mr
||=
merge_request
visit
project_merge_request_path
(
mr
.
project
,
mr
)
# Wait for MR widget to load
wait_for_requests
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