Add latest changes from gitlab-org/gitlab@master

2 files changed, 9 insertions, 2 deletions

diff --git a/spec/javascripts/reports/components/modal_spec.js b/spec/javascripts/reports/components/modal_spec.js
index d42c509e5b5..ff046e64b6e 100644
--- a/spec/javascripts/reports/components/modal_spec.js
+++ b/spec/javascripts/reports/components/modal_spec.js
@@ -42,8 +42,8 @@ describe('Grouped Test Reports Modal', () => {
     );
   });
 
-  it('renders miliseconds', () => {
-    expect(vm.$el.textContent).toContain(`${modalDataStructure.execution_time.value} ms`);
+  it('renders seconds', () => {
+    expect(vm.$el.textContent).toContain(`${modalDataStructure.execution_time.value} s`);
   });
 
   it('render title', () => {
diff --git a/spec/javascripts/user_popovers_spec.js b/spec/javascripts/user_popovers_spec.js
index 3962f837a00..b3def474957 100644
--- a/spec/javascripts/user_popovers_spec.js
+++ b/spec/javascripts/user_popovers_spec.js
@@ -38,6 +38,13 @@ describe('User Popovers', () => {
     expect(document.querySelectorAll(selector).length).toBe(popovers.length);
   });
 
+  it('does not initialize the user popovers twice for the same element', () => {
+    const newPopovers = initUserPopovers(document.querySelectorAll(selector));
+    const samePopovers = popovers.every((popover, index) => newPopovers[index] === popover);
+
+    expect(samePopovers).toBe(true);
+  });
+
   describe('when user link emits mouseenter event', () => {
     let userLink;