+
@@ -168,7 +168,7 @@ export default {
type="submit"
:disabled="isSubmitButtonDisabled"
:loading="showLoadingIcon"
- >{{ __('Protect') }}{{ s__('PackageRegistry|Add rule') }}
{{ __('Cancel') }}
diff --git a/app/assets/javascripts/packages_and_registries/settings/project/components/packages_protection_rules.vue b/app/assets/javascripts/packages_and_registries/settings/project/components/packages_protection_rules.vue
index 4522b37572d9bfedcf92f22773bd0f895b2d6405..2da970c422f0af306728b0605782d2ee84ec1bb6 100644
--- a/app/assets/javascripts/packages_and_registries/settings/project/components/packages_protection_rules.vue
+++ b/app/assets/javascripts/packages_and_registries/settings/project/components/packages_protection_rules.vue
@@ -42,7 +42,7 @@ export default {
},
inject: ['projectPath'],
i18n: {
- settingBlockTitle: s__('PackageRegistry|Package protection rules'),
+ settingBlockTitle: s__('PackageRegistry|Protected packages'),
settingBlockDescription: s__(
'PackageRegistry|When a package is protected then only certain user roles are able to update and delete the protected package. This helps to avoid tampering with the package.',
),
@@ -229,24 +229,24 @@ export default {
fields: [
{
key: 'col_1_package_name_pattern',
- label: s__('PackageRegistry|Package name pattern'),
- tdClass: 'gl-w-30',
+ label: s__('PackageRegistry|Name pattern'),
+ tdClass: 'gl-vertical-align-middle!',
},
{
key: 'col_2_package_type',
- label: s__('PackageRegistry|Package type'),
- tdClass: 'gl-w-10',
+ label: s__('PackageRegistry|Type'),
+ tdClass: 'gl-vertical-align-middle!',
},
{
key: 'col_3_push_protected_up_to_access_level',
label: I18N_PUSH_PROTECTED_UP_TO_ACCESS_LEVEL,
- tdClass: 'gl-w-15',
+ tdClass: 'gl-vertical-align-middle!',
},
{
key: 'col_4_actions',
label: '',
thClass: 'gl-display-none',
- tdClass: 'gl-w-10',
+ tdClass: 'gl-vertical-align-middle! gl-text-right',
},
],
modal: { id: 'delete-package-protection-rule-confirmation-modal' },
@@ -276,7 +276,7 @@ export default {
:disabled="isAddProtectionRuleButtonDisabled"
@click="showProtectionRuleForm"
>
- {{ s__('PackageRegistry|Add package protection rule') }}
+ {{ s__('PackageRegistry|Add protection rule') }}
+
{
const $toast = { show: jest.fn() };
const findSettingsBlock = () => wrapper.findComponent(SettingsBlock);
- const findTable = () => extendedWrapper(wrapper.findByRole('table', /protected Container/i));
+ const findTable = () =>
+ extendedWrapper(wrapper.findByRole('table', { name: /protected containers/i }));
const findTableBody = () => extendedWrapper(findTable().findAllByRole('rowgroup').at(1));
const findTableRow = (i) => extendedWrapper(findTableBody().findAllByRole('row').at(i));
const findTableLoadingIcon = () => wrapper.findComponent(GlLoadingIcon);
@@ -189,7 +190,7 @@ describe('Container protection rules project settings', () => {
.mockResolvedValueOnce(containerProtectionRuleQueryPayload());
const findPaginationButtonPrev = () =>
- extendedWrapper(findPagination()).findByRole('button', { name: 'Previous' });
+ extendedWrapper(findPagination()).findByRole('button', { name: /previous/i });
beforeEach(async () => {
createComponent({ containerProtectionRuleQueryResolver });
@@ -228,7 +229,7 @@ describe('Container protection rules project settings', () => {
);
const findPaginationButtonNext = () =>
- extendedWrapper(findPagination()).findByRole('button', { name: 'Next' });
+ extendedWrapper(findPagination()).findByRole('button', { name: /next/i });
beforeEach(async () => {
createComponent({ containerProtectionRuleQueryResolver });
diff --git a/spec/frontend/packages_and_registries/settings/project/settings/components/packages_protection_rule_form_spec.js b/spec/frontend/packages_and_registries/settings/project/settings/components/packages_protection_rule_form_spec.js
index 7697b7f6bd789204d7aade9657894252f7d86d21..a84901f7b6d7d6b30d68943c684b33dd35e58676 100644
--- a/spec/frontend/packages_and_registries/settings/project/settings/components/packages_protection_rule_form_spec.js
+++ b/spec/frontend/packages_and_registries/settings/project/settings/components/packages_protection_rule_form_spec.js
@@ -23,11 +23,11 @@ describe('Packages Protection Rule Form', () => {
};
const findPackageNamePatternInput = () =>
- wrapper.findByRole('textbox', { name: /package name pattern/i });
- const findPackageTypeSelect = () => wrapper.findByRole('combobox', { name: /package type/i });
+ wrapper.findByRole('textbox', { name: /name pattern/i });
+ const findPackageTypeSelect = () => wrapper.findByRole('combobox', { name: /type/i });
const findPushProtectedUpToAccessLevelSelect = () =>
wrapper.findByRole('combobox', { name: /push protected up to access level/i });
- const findSubmitButton = () => wrapper.findByRole('button', { name: /protect/i });
+ const findSubmitButton = () => wrapper.findByRole('button', { name: /add rule/i });
const findForm = () => wrapper.findComponent(GlForm);
const mountComponent = ({ data, config, provide = defaultProvidedValues } = {}) => {
@@ -219,7 +219,7 @@ describe('Packages Protection Rule Form', () => {
expect(findAlert().isVisible()).toBe(true);
expect(findAlert().text()).toMatch(
- /something went wrong while saving the package protection rule/i,
+ 'Something went wrong while saving the package protection rule',
);
});
});
diff --git a/spec/frontend/packages_and_registries/settings/project/settings/components/packages_protection_rules_spec.js b/spec/frontend/packages_and_registries/settings/project/settings/components/packages_protection_rules_spec.js
index a7670ef2efc5cae0909f02a4e4754d62aebe6246..d0d414e2c0f329b2a17e8b14c6c2f81fd5a7289f 100644
--- a/spec/frontend/packages_and_registries/settings/project/settings/components/packages_protection_rules_spec.js
+++ b/spec/frontend/packages_and_registries/settings/project/settings/components/packages_protection_rules_spec.js
@@ -31,14 +31,16 @@ describe('Packages protection rules project settings', () => {
const $toast = { show: jest.fn() };
const findSettingsBlock = () => wrapper.findComponent(SettingsBlock);
- const findTable = () => extendedWrapper(wrapper.findByRole('table', /protected packages/i));
+ const findTable = () =>
+ extendedWrapper(wrapper.findByRole('table', { name: /protected packages/i }));
const findTableBody = () => extendedWrapper(findTable().findAllByRole('rowgroup').at(1));
const findTableRow = (i) => extendedWrapper(findTableBody().findAllByRole('row').at(i));
- const findTableRowButtonDelete = (i) => findTableRow(i).findByRole('button', { name: /delete/i });
+ const findTableRowButtonDelete = (i) =>
+ findTableRow(i).findByRole('button', { name: /delete rule/i });
const findTableLoadingIcon = () => wrapper.findComponent(GlLoadingIcon);
const findProtectionRuleForm = () => wrapper.findComponent(PackagesProtectionRuleForm);
const findAddProtectionRuleButton = () =>
- wrapper.findByRole('button', { name: /add package protection rule/i });
+ wrapper.findByRole('button', { name: /add protection rule/i });
const findAlert = () => wrapper.findByRole('alert');
const findModal = () => wrapper.findComponent(GlModal);
@@ -197,7 +199,7 @@ describe('Packages protection rules project settings', () => {
.mockResolvedValueOnce(packagesProtectionRuleQueryPayload());
const findPaginationButtonPrev = () =>
- extendedWrapper(findPagination()).findByRole('button', { name: 'Previous' });
+ extendedWrapper(findPagination()).findByRole('button', { name: /previous/i });
beforeEach(async () => {
createComponent({ packagesProtectionRuleQueryResolver });
@@ -236,7 +238,7 @@ describe('Packages protection rules project settings', () => {
);
const findPaginationButtonNext = () =>
- extendedWrapper(findPagination()).findByRole('button', { name: 'Next' });
+ extendedWrapper(findPagination()).findByRole('button', { name: /next/i });
beforeEach(async () => {
createComponent({ packagesProtectionRuleQueryResolver });