Add latest changes from gitlab-org/gitlab@master

3 files changed, 26 insertions, 3 deletions

diff --git a/spec/frontend/authentication/webauthn/util_spec.js b/spec/frontend/authentication/webauthn/util_spec.js
new file mode 100644
index 00000000000..c9b8bfd8679
--- /dev/null
+++ b/spec/frontend/authentication/webauthn/util_spec.js
@@ -0,0 +1,19 @@
+import { base64ToBuffer, bufferToBase64 } from '~/authentication/webauthn/util';
+
+const encodedString = 'SGVsbG8gd29ybGQh';
+const stringBytes = [72, 101, 108, 108, 111, 32, 119, 111, 114, 108, 100, 33];
+
+describe('Webauthn utils', () => {
+  it('base64ToBuffer', () => {
+    const toArray = (val) => new Uint8Array(val);
+
+    expect(base64ToBuffer(encodedString)).toBeInstanceOf(ArrayBuffer);
+
+    expect(toArray(base64ToBuffer(encodedString))).toEqual(toArray(stringBytes));
+  });
+
+  it('bufferToBase64', () => {
+    const buffer = base64ToBuffer(encodedString);
+    expect(bufferToBase64(buffer)).toBe(encodedString);
+  });
+});
diff --git a/spec/frontend/environments/deployment_spec.js b/spec/frontend/environments/deployment_spec.js
index 992bffd6e3f..6ce0b76d98e 100644
--- a/spec/frontend/environments/deployment_spec.js
+++ b/spec/frontend/environments/deployment_spec.js
@@ -149,7 +149,7 @@ describe('~/environments/components/deployment.vue', () => {
     });
     describe('is not present', () => {
       it('does not show the timestamp', () => {
-        wrapper = createWrapper({ propsData: { deployment: { createdAt: null } } });
+        wrapper = createWrapper({ propsData: { deployment: { ...deployment, createdAt: null } } });
         const date = wrapper.findByTitle(formatDate(deployment.createdAt));
 
         expect(date.exists()).toBe(false);
@@ -205,6 +205,10 @@ describe('~/environments/components/deployment.vue', () => {
       expect(button.text()).toBe(__('Hide details'));
       expect(button.props('icon')).toBe('expand-up');
       expect(collapse.attributes('visible')).toBe('visible');
+
+      const username = wrapper.findByRole('link', { name: `@${deployment.user.username}` });
+
+      expect(username.attributes('href')).toBe(deployment.user.path);
     });
   });
 });
diff --git a/spec/frontend/runner/components/runner_list_spec.js b/spec/frontend/runner/components/runner_list_spec.js
index c50486b6f7b..42d6ecca09e 100644
--- a/spec/frontend/runner/components/runner_list_spec.js
+++ b/spec/frontend/runner/components/runner_list_spec.js
@@ -46,9 +46,9 @@ describe('RunnerList', () => {
 
     expect(headerLabels).toEqual([
       'Status',
-      'Runner ID',
+      'Runner',
       'Version',
-      'IP Address',
+      'IP',
       'Jobs',
       'Tags',
       'Last contact',