Review

3 files changed, 163 insertions, 159 deletions

diff --git a/app/assets/stylesheets/pages/milestone.scss b/app/assets/stylesheets/pages/milestone.scss
index 1729fe1c2e9..5c9b33b09ba 100644
--- a/app/assets/stylesheets/pages/milestone.scss
+++ b/app/assets/stylesheets/pages/milestone.scss
@@ -205,6 +205,7 @@
 
     .milestone-popover-body {
       padding: $gl-padding-8;
+      background-color: $gray-light;
     }
 
     .milestone-popover-footer {
diff --git a/spec/javascripts/feature_highlight/feature_highlight_helper_spec.js b/spec/javascripts/feature_highlight/feature_highlight_helper_spec.js
index e0fa50c68e2..2ab6a0077b5 100644
--- a/spec/javascripts/feature_highlight/feature_highlight_helper_spec.js
+++ b/spec/javascripts/feature_highlight/feature_highlight_helper_spec.js
@@ -6,11 +6,7 @@ import {
   dismiss,
   inserted,
 } from '~/feature_highlight/feature_highlight_helper';
-import {
-  togglePopover,
-  mouseleave,
-  mouseenter,
-} from '~/shared/popover';
+import { togglePopover } from '~/shared/popover';
 
 import getSetTimeoutPromise from 'spec/helpers/set_timeout_promise_helper';
 
@@ -22,110 +18,6 @@ describe('feature highlight helper', () => {
     });
   });
 
-  describe('togglePopover', () => {
-    describe('togglePopover(true)', () => {
-      it('returns true when popover is shown', () => {
-        const context = {
-          hasClass: () => false,
-          popover: () => {},
-          toggleClass: () => {},
-        };
-
-        expect(togglePopover.call(context, true)).toEqual(true);
-      });
-
-      it('returns false when popover is already shown', () => {
-        const context = {
-          hasClass: () => true,
-        };
-
-        expect(togglePopover.call(context, true)).toEqual(false);
-      });
-
-      it('shows popover', (done) => {
-        const context = {
-          hasClass: () => false,
-          popover: () => {},
-          toggleClass: () => {},
-        };
-
-        spyOn(context, 'popover').and.callFake((method) => {
-          expect(method).toEqual('show');
-          done();
-        });
-
-        togglePopover.call(context, true);
-      });
-
-      it('adds disable-animation and js-popover-show class', (done) => {
-        const context = {
-          hasClass: () => false,
-          popover: () => {},
-          toggleClass: () => {},
-        };
-
-        spyOn(context, 'toggleClass').and.callFake((classNames, show) => {
-          expect(classNames).toEqual('disable-animation js-popover-show');
-          expect(show).toEqual(true);
-          done();
-        });
-
-        togglePopover.call(context, true);
-      });
-    });
-
-    describe('togglePopover(false)', () => {
-      it('returns true when popover is hidden', () => {
-        const context = {
-          hasClass: () => true,
-          popover: () => {},
-          toggleClass: () => {},
-        };
-
-        expect(togglePopover.call(context, false)).toEqual(true);
-      });
-
-      it('returns false when popover is already hidden', () => {
-        const context = {
-          hasClass: () => false,
-        };
-
-        expect(togglePopover.call(context, false)).toEqual(false);
-      });
-
-      it('hides popover', (done) => {
-        const context = {
-          hasClass: () => true,
-          popover: () => {},
-          toggleClass: () => {},
-        };
-
-        spyOn(context, 'popover').and.callFake((method) => {
-          expect(method).toEqual('hide');
-          done();
-        });
-
-        togglePopover.call(context, false);
-      });
-
-      it('removes disable-animation and js-popover-show class', (done) => {
-        const context = {
-          hasClass: () => true,
-          popover: () => {},
-          toggleClass: () => {},
-        };
-
-        spyOn(context, 'toggleClass').and.callFake((classNames, show) => {
-          expect(classNames).toEqual('disable-animation js-popover-show');
-          expect(show).toEqual(false);
-          done();
-        });
-
-        togglePopover.call(context, false);
-      });
-    });
-  });
-
   describe('dismiss', () => {
     let mock;
     const context = {
@@ -166,56 +58,6 @@ describe('feature highlight helper', () => {
     });
   });
 
-  describe('mouseleave', () => {
-    it('calls hide popover if .popover:hover is false', () => {
-      const fakeJquery = {
-        length: 0,
-      };
-
-      spyOn($.fn, 'init').and.callFake(selector => (selector === '.popover:hover' ? fakeJquery : $.fn));
-      spyOn(togglePopover, 'call');
-      mouseleave();
-      expect(togglePopover.call).toHaveBeenCalledWith(jasmine.any(Object), false);
-    });
-
-    it('does not call hide popover if .popover:hover is true', () => {
-      const fakeJquery = {
-        length: 1,
-      };
-
-      spyOn($.fn, 'init').and.callFake(selector => (selector === '.popover:hover' ? fakeJquery : $.fn));
-      spyOn(togglePopover, 'call');
-      mouseleave();
-      expect(togglePopover.call).not.toHaveBeenCalledWith(false);
-    });
-  });
-
-  describe('mouseenter', () => {
-    const context = {};
-
-    it('shows popover', () => {
-      spyOn(togglePopover, 'call').and.returnValue(false);
-      mouseenter.call(context);
-      expect(togglePopover.call).toHaveBeenCalledWith(jasmine.any(Object), true);
-    });
-
-    it('registers mouseleave event if popover is showed', (done) => {
-      spyOn(togglePopover, 'call').and.returnValue(true);
-      spyOn($.fn, 'on').and.callFake((eventName) => {
-        expect(eventName).toEqual('mouseleave');
-        done();
-      });
-      mouseenter.call(context);
-    });
-
-    it('does not register mouseleave event if popover is not showed', () => {
-      spyOn(togglePopover, 'call').and.returnValue(false);
-      const spy = spyOn($.fn, 'on').and.callFake(() => {});
-      mouseenter.call(context);
-      expect(spy).not.toHaveBeenCalled();
-    });
-  });
-
   describe('inserted', () => {
     it('registers click event callback', (done) => {
       const context = {
diff --git a/spec/javascripts/shared/popover.js b/spec/javascripts/shared/popover.js
new file mode 100644
index 00000000000..17c3b0dd24a
--- /dev/null
+++ b/spec/javascripts/shared/popover.js
@@ -0,0 +1,161 @@
+import {
+  togglePopover,
+  mouseleave,
+  mouseenter,
+} from '~/shared/popover';
+
+describe('popover', () => {
+  describe('togglePopover', () => {
+    describe('togglePopover(true)', () => {
+      it('returns true when popover is shown', () => {
+        const context = {
+          hasClass: () => false,
+          popover: () => {},
+          toggleClass: () => {},
+        };
+  
+        expect(togglePopover.call(context, true)).toEqual(true);
+      });
+  
+      it('returns false when popover is already shown', () => {
+        const context = {
+          hasClass: () => true,
+        };
+  
+        expect(togglePopover.call(context, true)).toEqual(false);
+      });
+  
+      it('shows popover', (done) => {
+        const context = {
+          hasClass: () => false,
+          popover: () => {},
+          toggleClass: () => {},
+        };
+  
+        spyOn(context, 'popover').and.callFake((method) => {
+          expect(method).toEqual('show');
+          done();
+        });
+  
+        togglePopover.call(context, true);
+      });
+  
+      it('adds disable-animation and js-popover-show class', (done) => {
+        const context = {
+          hasClass: () => false,
+          popover: () => {},
+          toggleClass: () => {},
+        };
+  
+        spyOn(context, 'toggleClass').and.callFake((classNames, show) => {
+          expect(classNames).toEqual('disable-animation js-popover-show');
+          expect(show).toEqual(true);
+          done();
+        });
+  
+        togglePopover.call(context, true);
+      });
+    });
+  
+    describe('togglePopover(false)', () => {
+      it('returns true when popover is hidden', () => {
+        const context = {
+          hasClass: () => true,
+          popover: () => {},
+          toggleClass: () => {},
+        };
+  
+        expect(togglePopover.call(context, false)).toEqual(true);
+      });
+  
+      it('returns false when popover is already hidden', () => {
+        const context = {
+          hasClass: () => false,
+        };
+  
+        expect(togglePopover.call(context, false)).toEqual(false);
+      });
+  
+      it('hides popover', (done) => {
+        const context = {
+          hasClass: () => true,
+          popover: () => {},
+          toggleClass: () => {},
+        };
+  
+        spyOn(context, 'popover').and.callFake((method) => {
+          expect(method).toEqual('hide');
+          done();
+        });
+  
+        togglePopover.call(context, false);
+      });
+  
+      it('removes disable-animation and js-popover-show class', (done) => {
+        const context = {
+          hasClass: () => true,
+          popover: () => {},
+          toggleClass: () => {},
+        };
+  
+        spyOn(context, 'toggleClass').and.callFake((classNames, show) => {
+          expect(classNames).toEqual('disable-animation js-popover-show');
+          expect(show).toEqual(false);
+          done();
+        });
+  
+        togglePopover.call(context, false);
+      });
+    });
+  });
+
+  describe('mouseleave', () => {
+    it('calls hide popover if .popover:hover is false', () => {
+      const fakeJquery = {
+        length: 0,
+      };
+
+      spyOn($.fn, 'init').and.callFake(selector => (selector === '.popover:hover' ? fakeJquery : $.fn));
+      spyOn(togglePopover, 'call');
+      mouseleave();
+      expect(togglePopover.call).toHaveBeenCalledWith(jasmine.any(Object), false);
+    });
+
+    it('does not call hide popover if .popover:hover is true', () => {
+      const fakeJquery = {
+        length: 1,
+      };
+
+      spyOn($.fn, 'init').and.callFake(selector => (selector === '.popover:hover' ? fakeJquery : $.fn));
+      spyOn(togglePopover, 'call');
+      mouseleave();
+      expect(togglePopover.call).not.toHaveBeenCalledWith(false);
+    });
+  });
+
+  describe('mouseenter', () => {
+    const context = {};
+
+    it('shows popover', () => {
+      spyOn(togglePopover, 'call').and.returnValue(false);
+      mouseenter.call(context);
+      expect(togglePopover.call).toHaveBeenCalledWith(jasmine.any(Object), true);
+    });
+
+    it('registers mouseleave event if popover is showed', (done) => {
+      spyOn(togglePopover, 'call').and.returnValue(true);
+      spyOn($.fn, 'on').and.callFake((eventName) => {
+        expect(eventName).toEqual('mouseleave');
+        done();
+      });
+      mouseenter.call(context);
+    });
+
+    it('does not register mouseleave event if popover is not showed', () => {
+      spyOn(togglePopover, 'call').and.returnValue(false);
+      const spy = spyOn($.fn, 'on').and.callFake(() => {});
+      mouseenter.call(context);
+      expect(spy).not.toHaveBeenCalled();
+    });
+  });
+});
\ No newline at end of file