Commit f30bb778 authored by Doug Stull's avatar Doug Stull

Merge branch '333578-update-approval-status' into 'master'

Update legacy attribute for ManagedLicense Entity

See merge request gitlab-org/gitlab!82932
parents 90c9cc62 9bf63a5b
...@@ -4,8 +4,7 @@ module EE ...@@ -4,8 +4,7 @@ module EE
module API module API
module Entities module Entities
class ManagedLicense < Grape::Entity class ManagedLicense < Grape::Entity
expose :id, :name expose :id, :name, :approval_status
expose :legacy_approval_status, as: :approval_status
end end
end end
end end
......
...@@ -12,6 +12,7 @@ RSpec.describe 'EE > Projects > Licenses > Maintainer views policies', :js do ...@@ -12,6 +12,7 @@ RSpec.describe 'EE > Projects > Licenses > Maintainer views policies', :js do
before do before do
stub_licensed_features(license_scanning: true) stub_licensed_features(license_scanning: true)
stub_feature_flags(lc_remove_legacy_approval_status: false)
sign_in(maintainer) sign_in(maintainer)
visit(project_licenses_path(project)) visit(project_licenses_path(project))
......
...@@ -11,6 +11,7 @@ RSpec.describe API::ManagedLicenses do ...@@ -11,6 +11,7 @@ RSpec.describe API::ManagedLicenses do
before do before do
stub_licensed_features(license_scanning: true) stub_licensed_features(license_scanning: true)
stub_feature_flags(lc_remove_legacy_approval_status: false)
project.add_maintainer(maintainer_user) project.add_maintainer(maintainer_user)
project.add_developer(dev_user) project.add_developer(dev_user)
project.add_reporter(reporter_user) project.add_reporter(reporter_user)
......
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