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
3ea854f2
Commit
3ea854f2
authored
Feb 04, 2021
by
Sanad Liaquat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove retry on allow_local_requests_from_web_hooks_and_services
parent
5a2dc95f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
31 deletions
+21
-31
qa/qa/specs/features/browser_ui/2_plan/issue/jira_issue_import_spec.rb
...eatures/browser_ui/2_plan/issue/jira_issue_import_spec.rb
+11
-16
qa/qa/specs/features/browser_ui/3_create/jira/jira_basic_integration_spec.rb
...s/browser_ui/3_create/jira/jira_basic_integration_spec.rb
+10
-15
No files found.
qa/qa/specs/features/browser_ui/2_plan/issue/jira_issue_import_spec.rb
View file @
3ea854f2
...
...
@@ -39,27 +39,22 @@ module QA
private
def
set_up_jira_integration
# Retry is required because allow_local_requests_from_web_hooks_and_services
# takes some time to get enabled.
# Bug issue: https://gitlab.com/gitlab-org/gitlab/-/issues/217010
QA
::
Support
::
Retrier
.
retry_on_exception
(
max_attempts:
5
,
sleep_interval:
3
)
do
Runtime
::
ApplicationSettings
.
set_application_settings
(
allow_local_requests_from_web_hooks_and_services:
true
)
Runtime
::
ApplicationSettings
.
set_application_settings
(
allow_local_requests_from_web_hooks_and_services:
true
)
page
.
visit
Runtime
::
Scenario
.
gitlab_address
Flow
::
Login
.
sign_in_unless_signed_in
page
.
visit
Runtime
::
Scenario
.
gitlab_address
Flow
::
Login
.
sign_in_unless_signed_in
project
.
visit!
project
.
visit!
Page
::
Project
::
Menu
.
perform
(
&
:go_to_integrations_settings
)
QA
::
Page
::
Project
::
Settings
::
Integrations
.
perform
(
&
:click_jira_link
)
Page
::
Project
::
Menu
.
perform
(
&
:go_to_integrations_settings
)
QA
::
Page
::
Project
::
Settings
::
Integrations
.
perform
(
&
:click_jira_link
)
QA
::
Page
::
Project
::
Settings
::
Services
::
Jira
.
perform
do
|
jira
|
jira
.
setup_service_with
(
url:
Vendor
::
Jira
::
JiraAPI
.
perform
(
&
:base_url
))
end
expect
(
page
).
not_to
have_text
(
"Url is blocked"
)
expect
(
page
).
to
have_text
(
"Jira settings saved and active."
)
QA
::
Page
::
Project
::
Settings
::
Services
::
Jira
.
perform
do
|
jira
|
jira
.
setup_service_with
(
url:
Vendor
::
Jira
::
JiraAPI
.
perform
(
&
:base_url
))
end
expect
(
page
).
not_to
have_text
(
"Url is blocked"
)
expect
(
page
).
to
have_text
(
"Jira settings saved and active."
)
end
def
import_jira_issues
...
...
qa/qa/specs/features/browser_ui/3_create/jira/jira_basic_integration_spec.rb
View file @
3ea854f2
...
...
@@ -19,26 +19,21 @@ module QA
page
.
has_text?
'Welcome to Jira'
end
# Retry is required because allow_local_requests_from_web_hooks_and_services
# takes some time to get enabled.
# Bug issue: https://gitlab.com/gitlab-org/gitlab/-/issues/217010
QA
::
Support
::
Retrier
.
retry_on_exception
(
max_attempts:
5
,
sleep_interval:
3
)
do
Runtime
::
ApplicationSettings
.
set_application_settings
(
allow_local_requests_from_web_hooks_and_services:
true
)
Runtime
::
ApplicationSettings
.
set_application_settings
(
allow_local_requests_from_web_hooks_and_services:
true
)
page
.
visit
Runtime
::
Scenario
.
gitlab_address
Flow
::
Login
.
sign_in_unless_signed_in
page
.
visit
Runtime
::
Scenario
.
gitlab_address
Flow
::
Login
.
sign_in_unless_signed_in
project
.
visit!
project
.
visit!
Page
::
Project
::
Menu
.
perform
(
&
:go_to_integrations_settings
)
QA
::
Page
::
Project
::
Settings
::
Integrations
.
perform
(
&
:click_jira_link
)
Page
::
Project
::
Menu
.
perform
(
&
:go_to_integrations_settings
)
QA
::
Page
::
Project
::
Settings
::
Integrations
.
perform
(
&
:click_jira_link
)
QA
::
Page
::
Project
::
Settings
::
Services
::
Jira
.
perform
do
|
jira
|
jira
.
setup_service_with
(
url:
Vendor
::
Jira
::
JiraAPI
.
perform
(
&
:base_url
))
end
expect
(
page
).
not_to
have_text
(
"Requests to the local network are not allowed"
)
QA
::
Page
::
Project
::
Settings
::
Services
::
Jira
.
perform
do
|
jira
|
jira
.
setup_service_with
(
url:
Vendor
::
Jira
::
JiraAPI
.
perform
(
&
:base_url
))
end
expect
(
page
).
not_to
have_text
(
"Requests to the local network are not allowed"
)
end
it
'closes an issue via pushing a commit'
,
testcase:
'https://gitlab.com/gitlab-org/quality/testcases/-/issues/827'
do
...
...
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