Commit d7ffc806 authored by Sanad Liaquat's avatar Sanad Liaquat

Merge branch 'qa-shl-remove-retry-when-enabling-allow-local-requests' into 'master'

Remove retry on allow_local_requests_from_web_hooks_and_services

See merge request gitlab-org/gitlab!53140
parents 6f80f6af 3ea854f2
...@@ -39,10 +39,6 @@ module QA ...@@ -39,10 +39,6 @@ module QA
private private
def set_up_jira_integration 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 page.visit Runtime::Scenario.gitlab_address
...@@ -60,7 +56,6 @@ module QA ...@@ -60,7 +56,6 @@ module QA
expect(page).not_to have_text("Url is blocked") expect(page).not_to have_text("Url is blocked")
expect(page).to have_text("Jira settings saved and active.") expect(page).to have_text("Jira settings saved and active.")
end end
end
def import_jira_issues def import_jira_issues
Page::Project::Menu.perform(&:click_issues) Page::Project::Menu.perform(&:click_issues)
......
...@@ -19,10 +19,6 @@ module QA ...@@ -19,10 +19,6 @@ module QA
page.has_text? 'Welcome to Jira' page.has_text? 'Welcome to Jira'
end 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 page.visit Runtime::Scenario.gitlab_address
...@@ -39,7 +35,6 @@ module QA ...@@ -39,7 +35,6 @@ module QA
expect(page).not_to have_text("Requests to the local network are not allowed") expect(page).not_to have_text("Requests to the local network are not allowed")
end end
end
it 'closes an issue via pushing a commit', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/827' do it 'closes an issue via pushing a commit', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/827' do
issue_key = Vendor::Jira::JiraAPI.perform do |jira_api| issue_key = Vendor::Jira::JiraAPI.perform do |jira_api|
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment