Add latest changes from gitlab-org/gitlab@master

3 files changed, 6 insertions, 21 deletions

diff --git a/spec/frontend/deploy_keys/components/app_spec.js b/spec/frontend/deploy_keys/components/app_spec.js
index 291502c9ed7..8d37b5ce38f 100644
--- a/spec/frontend/deploy_keys/components/app_spec.js
+++ b/spec/frontend/deploy_keys/components/app_spec.js
@@ -64,12 +64,7 @@ describe('Deploy keys app component', () => {
       expect(element.exists()).toBe(true);
       expect(element.text().trim()).toContain(label);
 
-      expect(
-        element
-          .find('.badge')
-          .text()
-          .trim(),
-      ).toBe(count.toString());
+      expect(element.find('.badge').text().trim()).toBe(count.toString());
     });
   });
 
diff --git a/spec/frontend/deploy_keys/components/key_spec.js b/spec/frontend/deploy_keys/components/key_spec.js
index d990c64c241..f1305a45adc 100644
--- a/spec/frontend/deploy_keys/components/key_spec.js
+++ b/spec/frontend/deploy_keys/components/key_spec.js
@@ -9,11 +9,7 @@ describe('Deploy keys key', () => {
 
   const data = getJSONFixture('deploy_keys/keys.json');
 
-  const findTextAndTrim = selector =>
-    wrapper
-      .find(selector)
-      .text()
-      .trim();
+  const findTextAndTrim = selector => wrapper.find(selector).text().trim();
 
   const createComponent = propsData => {
     wrapper = mount(key, {
@@ -103,10 +99,7 @@ describe('Deploy keys key', () => {
     it('expands all project labels after click', () => {
       createComponent({ deployKey });
       const { length } = deployKey.deploy_keys_projects;
-      wrapper
-        .findAll('.deploy-project-label')
-        .at(1)
-        .trigger('click');
+      wrapper.findAll('.deploy-project-label').at(1).trigger('click');
 
       return wrapper.vm.$nextTick().then(() => {
         const labels = wrapper.findAll('.deploy-project-label');
diff --git a/spec/frontend/deploy_keys/components/keys_panel_spec.js b/spec/frontend/deploy_keys/components/keys_panel_spec.js
index 53c8ba073bc..ecfbcaec894 100644
--- a/spec/frontend/deploy_keys/components/keys_panel_spec.js
+++ b/spec/frontend/deploy_keys/components/keys_panel_spec.js
@@ -48,12 +48,9 @@ describe('Deploy keys panel', () => {
 
     expect(wrapper.find('.settings-message').exists()).toBe(true);
 
-    expect(
-      wrapper
-        .find('.settings-message')
-        .text()
-        .trim(),
-    ).toBe('No deploy keys found. Create one with the form above.');
+    expect(wrapper.find('.settings-message').text().trim()).toBe(
+      'No deploy keys found. Create one with the form above.',
+    );
   });
 
   it('renders no table header if keys are empty', () => {