Merge branch 'master' into 'gl-ui-tooltip'gl-ui-tooltip

# Conflicts:
#   app/assets/javascripts/commons/gitlab_ui.js

1 files changed, 15 insertions, 18 deletions

diff --git a/spec/javascripts/monitoring/graph/flag_spec.js b/spec/javascripts/monitoring/graph/flag_spec.js
index a837b71db0b..038bfffd44f 100644
--- a/spec/javascripts/monitoring/graph/flag_spec.js
+++ b/spec/javascripts/monitoring/graph/flag_spec.js
@@ -2,7 +2,7 @@ import Vue from 'vue';
 import GraphFlag from '~/monitoring/components/graph/flag.vue';
 import { deploymentData } from '../mock_data';
 
-const createComponent = (propsData) => {
+const createComponent = propsData => {
   const Component = Vue.extend(GraphFlag);
 
   return new Component({
@@ -51,8 +51,7 @@ describe('GraphFlag', () => {
   it('has a line at the currentXCoordinate', () => {
     component = createComponent(defaultValuesComponent);
 
-    expect(component.$el.style.left)
-      .toEqual(`${70 + component.currentXCoordinate}px`);
+    expect(component.$el.style.left).toEqual(`${70 + component.currentXCoordinate}px`);
   });
 
   describe('Deployment flag', () => {
@@ -62,9 +61,7 @@ describe('GraphFlag', () => {
         deploymentFlagData,
       });
 
-      expect(
-        deploymentFlagComponent.$el.querySelector('.popover-title'),
-      ).toContainText('Deployed');
+      expect(deploymentFlagComponent.$el.querySelector('.popover-title')).toContainText('Deployed');
     });
 
     it('contains the ref when a tag is available', () => {
@@ -78,13 +75,13 @@ describe('GraphFlag', () => {
         },
       });
 
-      expect(
-        deploymentFlagComponent.$el.querySelector('.deploy-meta-content'),
-      ).toContainText('f5bcd1d9');
+      expect(deploymentFlagComponent.$el.querySelector('.deploy-meta-content')).toContainText(
+        'f5bcd1d9',
+      );
 
-      expect(
-        deploymentFlagComponent.$el.querySelector('.deploy-meta-content'),
-      ).toContainText('1.0');
+      expect(deploymentFlagComponent.$el.querySelector('.deploy-meta-content')).toContainText(
+        '1.0',
+      );
     });
 
     it('does not contain the ref when a tag is unavailable', () => {
@@ -98,13 +95,13 @@ describe('GraphFlag', () => {
         },
       });
 
-      expect(
-        deploymentFlagComponent.$el.querySelector('.deploy-meta-content'),
-      ).toContainText('f5bcd1d9');
+      expect(deploymentFlagComponent.$el.querySelector('.deploy-meta-content')).toContainText(
+        'f5bcd1d9',
+      );
 
-      expect(
-        deploymentFlagComponent.$el.querySelector('.deploy-meta-content'),
-      ).not.toContainText('1.0');
+      expect(deploymentFlagComponent.$el.querySelector('.deploy-meta-content')).not.toContainText(
+        '1.0',
+      );
     });
   });