Commit 6c8b3ab0 authored by Aishwarya Subramanian's avatar Aishwarya Subramanian

Renamed license to enforce_personal_access_token_expiration

The license name is renamed since it shares the same
name as the FF name.
Re naming it will ensure the feature gets GA for
all instances.
parent 15d10a77
...@@ -47,7 +47,7 @@ module EE ...@@ -47,7 +47,7 @@ module EE
end end
def enforce_pat_expiration_feature_available? def enforce_pat_expiration_feature_available?
License.feature_available?(:enforce_pat_expiration) License.feature_available?(:enforce_personal_access_token_expiration)
end end
end end
......
...@@ -144,7 +144,7 @@ class License < ApplicationRecord ...@@ -144,7 +144,7 @@ class License < ApplicationRecord
dast dast
dependency_scanning dependency_scanning
devops_adoption devops_adoption
enforce_pat_expiration enforce_personal_access_token_expiration
enforce_ssh_key_expiration enforce_ssh_key_expiration
enterprise_templates enterprise_templates
environment_alerts environment_alerts
......
--- ---
title: Optional enforcement of PAT expiration title: Optional enforcement of PAT expiration (feature flag removed)
merge_request: 53660 merge_request: 53660
author: author:
type: added type: added
...@@ -12,7 +12,7 @@ RSpec.describe Profiles::PersonalAccessTokensController do ...@@ -12,7 +12,7 @@ RSpec.describe Profiles::PersonalAccessTokensController do
before do before do
sign_in(user) sign_in(user)
stub_licensed_features(enforce_pat_expiration: licensed) stub_licensed_features(enforce_personal_access_token_expiration: licensed)
stub_application_setting(enforce_pat_expiration: application_setting) stub_application_setting(enforce_pat_expiration: application_setting)
end end
......
...@@ -156,7 +156,7 @@ RSpec.describe PersonalAccessTokensHelper do ...@@ -156,7 +156,7 @@ RSpec.describe PersonalAccessTokensHelper do
describe '#enforce_pat_expiration_feature_available?' do describe '#enforce_pat_expiration_feature_available?' do
subject { helper.enforce_pat_expiration_feature_available? } subject { helper.enforce_pat_expiration_feature_available? }
let(:feature) { :enforce_pat_expiration } let(:feature) { :enforce_personal_access_token_expiration }
it_behaves_like 'feature availability' it_behaves_like 'feature availability'
end end
......
...@@ -220,7 +220,7 @@ RSpec.describe PersonalAccessToken do ...@@ -220,7 +220,7 @@ RSpec.describe PersonalAccessToken do
with_them do with_them do
before do before do
stub_licensed_features(enforce_pat_expiration: licensed) stub_licensed_features(enforce_personal_access_token_expiration: licensed)
stub_application_setting(enforce_pat_expiration: application_setting) stub_application_setting(enforce_pat_expiration: application_setting)
end end
...@@ -254,7 +254,7 @@ RSpec.describe PersonalAccessToken do ...@@ -254,7 +254,7 @@ RSpec.describe PersonalAccessToken do
with_them do with_them do
before do before do
stub_licensed_features(enforce_pat_expiration: licensed) stub_licensed_features(enforce_personal_access_token_expiration: licensed)
end end
it { expect(subject).to be result } it { expect(subject).to be result }
......
...@@ -65,7 +65,7 @@ RSpec.describe PersonalAccessTokens::RevokeInvalidTokens do ...@@ -65,7 +65,7 @@ RSpec.describe PersonalAccessTokens::RevokeInvalidTokens do
with_them do with_them do
before do before do
stub_licensed_features(enforce_pat_expiration: licensed) stub_licensed_features(enforce_personal_access_token_expiration: licensed)
stub_application_setting(enforce_pat_expiration: application_setting) stub_application_setting(enforce_pat_expiration: application_setting)
it_behaves_like behavior it_behaves_like behavior
......
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