Commit 9db63a4e authored by Will Meek's avatar Will Meek Committed by Andrejs Cunskis

Fix for License Compliance Spec

Fix for 357972, move check
for feature flag out of
loop where we approve or
deny licenses
parent 28d1ae38
...@@ -52,7 +52,7 @@ module QA ...@@ -52,7 +52,7 @@ module QA
.join('../../../../../ee/fixtures/secure_premade_reports/gl-license-scanning-report.json')) }] .join('../../../../../ee/fixtures/secure_premade_reports/gl-license-scanning-report.json')) }]
project_push.commit_message = 'Create Secure compatible application to serve premade reports' project_push.commit_message = 'Create Secure compatible application to serve premade reports'
end end
remove_legacy_ff_enabled = Runtime::Feature.enabled?(:lc_remove_legacy_approval_status)
Flow::Login.sign_in_unless_signed_in Flow::Login.sign_in_unless_signed_in
@project.visit! @project.visit!
Flow::Pipeline.wait_for_latest_pipeline(status: 'passed') Flow::Pipeline.wait_for_latest_pipeline(status: 'passed')
...@@ -60,11 +60,9 @@ module QA ...@@ -60,11 +60,9 @@ module QA
Page::Project::Menu.perform(&:click_on_license_compliance) Page::Project::Menu.perform(&:click_on_license_compliance)
EE::Page::Project::Secure::LicenseCompliance.perform do |license_compliance| EE::Page::Project::Secure::LicenseCompliance.perform do |license_compliance|
license_compliance.open_tab license_compliance.open_tab
selector = remove_legacy_ff_enabled ? :allowed_license_radio : :approved_license_radio
selector = Runtime::Feature.enabled?(:lc_remove_legacy_approval_status) ? :allowed_license_radio : :approved_license_radio
license_compliance.approve_license(approved_license_name, selector) license_compliance.approve_license(approved_license_name, selector)
selector = remove_legacy_ff_enabled ? :denied_license_radio : :blacklisted_license_radio
selector = Runtime::Feature.enabled?(:lc_remove_legacy_approval_status) ? :denied_license_radio : :blacklisted_license_radio
license_compliance.deny_license(denied_license_name, selector) license_compliance.deny_license(denied_license_name, selector)
end end
end end
......
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