Add latest changes from gitlab-org/gitlab@master

2 files changed, 11 insertions, 31 deletions

diff --git a/spec/frontend/performance_bar/components/performance_bar_app_spec.js b/spec/frontend/performance_bar/components/performance_bar_app_spec.js
index 67a4259a8e3..2c9ab4bf78d 100644
--- a/spec/frontend/performance_bar/components/performance_bar_app_spec.js
+++ b/spec/frontend/performance_bar/components/performance_bar_app_spec.js
@@ -18,4 +18,15 @@ describe('performance bar app', () => {
   it('sets the class to match the environment', () => {
     expect(wrapper.element.getAttribute('class')).toContain('development');
   });
+
+  describe('changeCurrentRequest', () => {
+    it('emits a change-request event', () => {
+      expect(wrapper.emitted('change-request')).toBeUndefined();
+
+      wrapper.vm.changeCurrentRequest('123');
+
+      expect(wrapper.emitted('change-request')).toBeDefined();
+      expect(wrapper.emitted('change-request')[0]).toEqual(['123']);
+    });
+  });
 });
diff --git a/spec/frontend/performance_bar/components/request_selector_spec.js b/spec/frontend/performance_bar/components/request_selector_spec.js
deleted file mode 100644
index 9cc8c5e73f4..00000000000
--- a/spec/frontend/performance_bar/components/request_selector_spec.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import { shallowMount } from '@vue/test-utils';
-import RequestSelector from '~/performance_bar/components/request_selector.vue';
-
-describe('request selector', () => {
-  const requests = [
-    {
-      id: 'warningReq',
-      url: 'https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/1/discussions.json',
-      truncatedUrl: 'discussions.json',
-      hasWarnings: true,
-    },
-  ];
-
-  const wrapper = shallowMount(RequestSelector, {
-    propsData: {
-      requests,
-      currentRequest: requests[0],
-    },
-  });
-
-  it('has a warning icon if any requests have warnings', () => {
-    expect(wrapper.find('span > gl-emoji').element.dataset.name).toEqual('warning');
-  });
-
-  it('adds a warning glyph to requests with warnings', () => {
-    const requestValue = wrapper.find('[value="warningReq"]').text();
-
-    expect(requestValue).toContain('discussions.json');
-    expect(requestValue).toContain('(!)');
-  });
-});