From a9b7ab6f2b734409762e4a42dac660d23c636d97 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Wed, 25 Nov 2020 12:09:23 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 spec/frontend/diffs/components/compare_dropdown_layout_spec.js | 8 ++++----
 spec/frontend/diffs/components/compare_versions_spec.js        | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'spec/frontend')

diff --git a/spec/frontend/diffs/components/compare_dropdown_layout_spec.js b/spec/frontend/diffs/components/compare_dropdown_layout_spec.js
index a163a43daf1..92e4a2d9c62 100644
--- a/spec/frontend/diffs/components/compare_dropdown_layout_spec.js
+++ b/spec/frontend/diffs/components/compare_dropdown_layout_spec.js
@@ -1,4 +1,4 @@
-import { shallowMount } from '@vue/test-utils';
+import { mount } from '@vue/test-utils';
 import { trimText } from 'helpers/text_helper';
 import TimeAgo from '~/vue_shared/components/time_ago_tooltip.vue';
 import CompareDropdownLayout from '~/diffs/components/compare_dropdown_layout.vue';
@@ -22,7 +22,7 @@ describe('CompareDropdownLayout', () => {
   });
 
   const createComponent = (propsData = {}) => {
-    wrapper = shallowMount(CompareDropdownLayout, {
+    wrapper = mount(CompareDropdownLayout, {
       propsData: {
         ...propsData,
       },
@@ -35,7 +35,7 @@ describe('CompareDropdownLayout', () => {
       href: listItem.find('a').attributes('href'),
       text: trimText(listItem.text()),
       createdAt: listItem.findAll(TimeAgo).wrappers[0]?.props('time'),
-      isActive: listItem.find('a.is-active').exists(),
+      isActive: listItem.classes().includes('is-active'),
     }));
 
   afterEach(() => {
@@ -69,7 +69,7 @@ describe('CompareDropdownLayout', () => {
       expect(findListItemsData()).toEqual([
         {
           href: 'version/1',
-          text: 'version 1 (base) abcdef1 1 commit',
+          text: 'version 1 (base) abcdef1 1 commit 2 years ago',
           createdAt: TEST_CREATED_AT,
           isActive: true,
         },
diff --git a/spec/frontend/diffs/components/compare_versions_spec.js b/spec/frontend/diffs/components/compare_versions_spec.js
index b3dfc71260c..09e9669c474 100644
--- a/spec/frontend/diffs/components/compare_versions_spec.js
+++ b/spec/frontend/diffs/components/compare_versions_spec.js
@@ -59,8 +59,8 @@ describe('CompareVersions', () => {
 
       expect(sourceDropdown.exists()).toBe(true);
       expect(targetDropdown.exists()).toBe(true);
-      expect(sourceDropdown.find('a span').html()).toContain('latest version');
-      expect(targetDropdown.find('a span').html()).toContain(targetBranchName);
+      expect(sourceDropdown.find('a p').html()).toContain('latest version');
+      expect(targetDropdown.find('button').html()).toContain(targetBranchName);
     });
 
     it('should not render comparison dropdowns if no mergeRequestDiffs are specified', () => {
-- 
cgit v1.2.1