Add latest changes from gitlab-org/gitlab@master

1 files changed, 12 insertions, 8 deletions

diff --git a/spec/frontend/access_tokens/index_spec.js b/spec/frontend/access_tokens/index_spec.js
index e3f17e21739..1d8ac7cec25 100644
--- a/spec/frontend/access_tokens/index_spec.js
+++ b/spec/frontend/access_tokens/index_spec.js
@@ -25,18 +25,22 @@ describe('access tokens', () => {
   });
 
   describe.each`
-    initFunction          | mountSelector                    | expectedComponent
-    ${initExpiresAtField} | ${'js-access-tokens-expires-at'} | ${ExpiresAtField}
-    ${initProjectsField}  | ${'js-access-tokens-projects'}   | ${ProjectsField}
-  `('$initFunction', ({ initFunction, mountSelector, expectedComponent }) => {
+    initFunction          | mountSelector                    | fieldName      | expectedComponent
+    ${initExpiresAtField} | ${'js-access-tokens-expires-at'} | ${'expiresAt'} | ${ExpiresAtField}
+    ${initProjectsField}  | ${'js-access-tokens-projects'}   | ${'projects'}  | ${ProjectsField}
+  `('$initFunction', ({ initFunction, mountSelector, fieldName, expectedComponent }) => {
     describe('when mount element exists', () => {
+      const nameAttribute = `access_tokens[${fieldName}]`;
+      const idAttribute = `access_tokens_${fieldName}`;
+
       beforeEach(() => {
         const mountEl = document.createElement('div');
         mountEl.classList.add(mountSelector);
 
         const input = document.createElement('input');
-        input.setAttribute('name', 'foo-bar');
-        input.setAttribute('id', 'foo-bar');
+        input.setAttribute('name', nameAttribute);
+        input.setAttribute('data-js-name', fieldName);
+        input.setAttribute('id', idAttribute);
         input.setAttribute('placeholder', 'Foo bar');
         input.setAttribute('value', '1,2');
 
@@ -57,8 +61,8 @@ describe('access tokens', () => {
 
         expect(component.exists()).toBe(true);
         expect(component.props('inputAttrs')).toEqual({
-          name: 'foo-bar',
-          id: 'foo-bar',
+          name: nameAttribute,
+          id: idAttribute,
           value: '1,2',
           placeholder: 'Foo bar',
         });