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
0a830464
Commit
0a830464
authored
Dec 30, 2019
by
Sanad Liaquat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix merge request widget spec flakiness
parent
8f23a3bb
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
2 deletions
+8
-2
qa/qa/ee/page/component/license_management.rb
qa/qa/ee/page/component/license_management.rb
+0
-2
qa/qa/ee/page/merge_request/show.rb
qa/qa/ee/page/merge_request/show.rb
+6
-0
qa/qa/specs/features/ee/browser_ui/secure/merge_request_license_widget_spec.rb
...ee/browser_ui/secure/merge_request_license_widget_spec.rb
+2
-0
No files found.
qa/qa/ee/page/component/license_management.rb
View file @
0a830464
...
@@ -49,13 +49,11 @@ module QA
...
@@ -49,13 +49,11 @@ module QA
def
approve_license
(
name
)
def
approve_license
(
name
)
click_license
(
name
)
click_license
(
name
)
click_element
(
:approve_license_button
)
click_element
(
:approve_license_button
)
wait_for_animated_element
(
:license_management_modal
)
end
end
def
blacklist_license
(
name
)
def
blacklist_license
(
name
)
click_license
(
name
)
click_license
(
name
)
click_element
(
:blacklist_license_button
)
click_element
(
:blacklist_license_button
)
wait_for_animated_element
(
:license_management_modal
)
end
end
end
end
end
end
...
...
qa/qa/ee/page/merge_request/show.rb
View file @
0a830464
...
@@ -90,6 +90,12 @@ module QA
...
@@ -90,6 +90,12 @@ module QA
end
end
end
end
def
wait_for_license_compliance_report
wait
(
reload:
false
)
do
has_no_text?
(
'Loading License Compliance report'
)
end
end
def
approvals_required_from
def
approvals_required_from
approvals_content
.
match
(
/approvals? from (.*)/
)[
1
]
approvals_content
.
match
(
/approvals? from (.*)/
)[
1
]
end
end
...
...
qa/qa/specs/features/ee/browser_ui/secure/merge_request_license_widget_spec.rb
View file @
0a830464
...
@@ -123,6 +123,8 @@ module QA
...
@@ -123,6 +123,8 @@ module QA
show
.
approve_license_with_mr
(
approved_license_name
)
show
.
approve_license_with_mr
(
approved_license_name
)
show
.
blacklist_license_with_mr
(
blacklisted_license_name
)
show
.
blacklist_license_with_mr
(
blacklisted_license_name
)
show
.
wait_for_license_compliance_report
expect
(
show
).
to
have_approved_license
approved_license_name
expect
(
show
).
to
have_approved_license
approved_license_name
expect
(
show
).
to
have_blacklisted_license
blacklisted_license_name
expect
(
show
).
to
have_blacklisted_license
blacklisted_license_name
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