Commit 96f736c9 authored by Simon Knox's avatar Simon Knox

Merge branch 'afontaine/remove-legacy-flags-frontend-form' into 'master'

Remove Legacy Flags from Feature Flag Form

See merge request gitlab-org/gitlab!64006
parents 566467f3 2a55152c
...@@ -13610,9 +13610,6 @@ msgstr "" ...@@ -13610,9 +13610,6 @@ msgstr ""
msgid "FeatureFlags|Enable features for specific users and environments by configuring feature flag strategies." msgid "FeatureFlags|Enable features for specific users and environments by configuring feature flag strategies."
msgstr "" msgstr ""
msgid "FeatureFlags|Environment Spec"
msgstr ""
msgid "FeatureFlags|Environment Specs" msgid "FeatureFlags|Environment Specs"
msgstr "" msgstr ""
...@@ -13658,9 +13655,6 @@ msgstr "" ...@@ -13658,9 +13655,6 @@ msgstr ""
msgid "FeatureFlags|Inactive flag for %{scope}" msgid "FeatureFlags|Inactive flag for %{scope}"
msgstr "" msgstr ""
msgid "FeatureFlags|Include additional user IDs"
msgstr ""
msgid "FeatureFlags|Install a %{docsLinkAnchoredStart}compatible client library%{docsLinkAnchoredEnd} and specify the API URL, application name, and instance ID during the configuration setup. %{docsLinkStart}More Information%{docsLinkEnd}" msgid "FeatureFlags|Install a %{docsLinkAnchoredStart}compatible client library%{docsLinkAnchoredEnd} and specify the API URL, application name, and instance ID during the configuration setup. %{docsLinkStart}More Information%{docsLinkEnd}"
msgstr "" msgstr ""
...@@ -13700,24 +13694,12 @@ msgstr "" ...@@ -13700,24 +13694,12 @@ msgstr ""
msgid "FeatureFlags|Percent rollout" msgid "FeatureFlags|Percent rollout"
msgstr "" msgstr ""
msgid "FeatureFlags|Percent rollout (logged in users)"
msgstr ""
msgid "FeatureFlags|Percent rollout must be an integer number between 0 and 100" msgid "FeatureFlags|Percent rollout must be an integer number between 0 and 100"
msgstr "" msgstr ""
msgid "FeatureFlags|Protected"
msgstr ""
msgid "FeatureFlags|Remove" msgid "FeatureFlags|Remove"
msgstr "" msgstr ""
msgid "FeatureFlags|Rollout Percentage"
msgstr ""
msgid "FeatureFlags|Rollout Strategy"
msgstr ""
msgid "FeatureFlags|Set the Unleash client application name to the name of the environment your application runs in. This value is used to match environment scopes. See the %{linkStart}example client configuration%{linkEnd}." msgid "FeatureFlags|Set the Unleash client application name to the name of the environment your application runs in. This value is used to match environment scopes. See the %{linkStart}example client configuration%{linkEnd}."
msgstr "" msgstr ""
...@@ -13727,9 +13709,6 @@ msgstr "" ...@@ -13727,9 +13709,6 @@ msgstr ""
msgid "FeatureFlags|Strategies" msgid "FeatureFlags|Strategies"
msgstr "" msgstr ""
msgid "FeatureFlags|Target environments"
msgstr ""
msgid "FeatureFlags|There was an error fetching the feature flags." msgid "FeatureFlags|There was an error fetching the feature flags."
msgstr "" msgstr ""
......
...@@ -115,7 +115,7 @@ describe('Edit feature flag form', () => { ...@@ -115,7 +115,7 @@ describe('Edit feature flag form', () => {
}); });
it('should set the version of the form from the feature flag', () => { it('should set the version of the form from the feature flag', () => {
expect(wrapper.find(Form).props('version')).toBe(LEGACY_FLAG); expect(wrapper.find(Form).attributes('version')).toBe(LEGACY_FLAG);
mock.resetHandlers(); mock.resetHandlers();
...@@ -136,7 +136,7 @@ describe('Edit feature flag form', () => { ...@@ -136,7 +136,7 @@ describe('Edit feature flag form', () => {
factory(); factory();
return axios.waitForAll().then(() => { return axios.waitForAll().then(() => {
expect(wrapper.find(Form).props('version')).toBe(NEW_VERSION_FLAG); expect(wrapper.find(Form).attributes('version')).toBe(NEW_VERSION_FLAG);
}); });
}); });
......
...@@ -81,8 +81,6 @@ describe('New feature flag form', () => { ...@@ -81,8 +81,6 @@ describe('New feature flag form', () => {
rolloutUserIds: '', rolloutUserIds: '',
}; };
expect(wrapper.vm.scopes).toEqual([defaultScope]); expect(wrapper.vm.scopes).toEqual([defaultScope]);
expect(wrapper.find(Form).props('scopes')).toContainEqual(defaultScope);
}); });
it('has an all users strategy by default', () => { it('has an all users strategy by default', () => {
......
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