Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42

1 files changed, 13 insertions, 3 deletions

diff --git a/spec/frontend/ide/components/repo_tab_spec.js b/spec/frontend/ide/components/repo_tab_spec.js
index f35726de27c..a44c8b4d5ee 100644
--- a/spec/frontend/ide/components/repo_tab_spec.js
+++ b/spec/frontend/ide/components/repo_tab_spec.js
@@ -100,6 +100,18 @@ describe('RepoTab', () => {
     expect(wrapper.find('.file-modified').exists()).toBe(true);
   });
 
+  it.each`
+    tabProps             | closeLabel
+    ${{}}                | ${'Close foo.txt'}
+    ${{ changed: true }} | ${'foo.txt changed'}
+  `('close button has label ($closeLabel) with tab ($tabProps)', ({ tabProps, closeLabel }) => {
+    const tab = { ...file('foo.txt'), ...tabProps };
+
+    createComponent({ tab });
+
+    expect(wrapper.find('button').attributes('aria-label')).toBe(closeLabel);
+  });
+
   describe('locked file', () => {
     let f;
 
@@ -122,9 +134,7 @@ describe('RepoTab', () => {
     });
 
     it('renders a tooltip', () => {
-      expect(wrapper.find('span:nth-child(2)').attributes('data-original-title')).toContain(
-        'Locked by testuser',
-      );
+      expect(wrapper.find('span:nth-child(2)').attributes('title')).toBe('Locked by testuser');
     });
   });