Add latest changes from gitlab-org/gitlab@master

2 files changed, 34 insertions, 8 deletions

diff --git a/spec/frontend/profile/components/followers_tab_spec.js b/spec/frontend/profile/components/followers_tab_spec.js
index 4af428c4e0c..9cc5bdea9be 100644
--- a/spec/frontend/profile/components/followers_tab_spec.js
+++ b/spec/frontend/profile/components/followers_tab_spec.js
@@ -1,4 +1,4 @@
-import { GlTab } from '@gitlab/ui';
+import { GlBadge, GlTab } from '@gitlab/ui';
 
 import { s__ } from '~/locale';
 import FollowersTab from '~/profile/components/followers_tab.vue';
@@ -8,12 +8,25 @@ describe('FollowersTab', () => {
   let wrapper;
 
   const createComponent = () => {
-    wrapper = shallowMountExtended(FollowersTab);
+    wrapper = shallowMountExtended(FollowersTab, {
+      provide: {
+        followers: 2,
+      },
+    });
   };
 
-  it('renders `GlTab` and sets `title` prop', () => {
+  it('renders `GlTab` and sets title', () => {
     createComponent();
 
-    expect(wrapper.findComponent(GlTab).attributes('title')).toBe(s__('UserProfile|Followers'));
+    expect(wrapper.findComponent(GlTab).element.textContent).toContain(
+      s__('UserProfile|Followers'),
+    );
+  });
+
+  it('renders `GlBadge`, sets size and content', () => {
+    createComponent();
+
+    expect(wrapper.findComponent(GlBadge).attributes('size')).toBe('sm');
+    expect(wrapper.findComponent(GlBadge).element.textContent).toBe('2');
   });
 });
diff --git a/spec/frontend/profile/components/following_tab_spec.js b/spec/frontend/profile/components/following_tab_spec.js
index 75123274ccb..c9d56360c3e 100644
--- a/spec/frontend/profile/components/following_tab_spec.js
+++ b/spec/frontend/profile/components/following_tab_spec.js
@@ -1,4 +1,4 @@
-import { GlTab } from '@gitlab/ui';
+import { GlBadge, GlTab } from '@gitlab/ui';
 
 import { s__ } from '~/locale';
 import FollowingTab from '~/profile/components/following_tab.vue';
@@ -8,12 +8,25 @@ describe('FollowingTab', () => {
   let wrapper;
 
   const createComponent = () => {
-    wrapper = shallowMountExtended(FollowingTab);
+    wrapper = shallowMountExtended(FollowingTab, {
+      provide: {
+        followees: 3,
+      },
+    });
   };
 
-  it('renders `GlTab` and sets `title` prop', () => {
+  it('renders `GlTab` and sets title', () => {
     createComponent();
 
-    expect(wrapper.findComponent(GlTab).attributes('title')).toBe(s__('UserProfile|Following'));
+    expect(wrapper.findComponent(GlTab).element.textContent).toContain(
+      s__('UserProfile|Following'),
+    );
+  });
+
+  it('renders `GlBadge`, sets size and content', () => {
+    createComponent();
+
+    expect(wrapper.findComponent(GlBadge).attributes('size')).toBe('sm');
+    expect(wrapper.findComponent(GlBadge).element.textContent).toBe('3');
   });
 });