From 0712297ba594df1a57aa9e770cadde4c768a3bf6 Mon Sep 17 00:00:00 2001 From: Roman Hotsiy Date: Sun, 17 Jan 2016 21:50:42 +0200 Subject: [PATCH] Fix tests --- lib/common/components/StickySidebar/sticky-sidebar.js | 2 +- lib/common/components/StickySidebar/sticky-sidebar.spec.js | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/common/components/StickySidebar/sticky-sidebar.js b/lib/common/components/StickySidebar/sticky-sidebar.js index 26866834..345d1d8e 100644 --- a/lib/common/components/StickySidebar/sticky-sidebar.js +++ b/lib/common/components/StickySidebar/sticky-sidebar.js @@ -55,7 +55,7 @@ export default class StickySidebar { } get scrollY() { - return (this.scrollParent.pageYOffset === null) ? this.scrollParent.scrollTop : this.scrollParent.pageYOffset; + return (this.scrollParent.pageYOffset !== null) ? this.scrollParent.pageYOffset : this.scrollParent.scrollTop; } ngOnInit() { diff --git a/lib/common/components/StickySidebar/sticky-sidebar.spec.js b/lib/common/components/StickySidebar/sticky-sidebar.spec.js index c2992276..96bc5b3a 100644 --- a/lib/common/components/StickySidebar/sticky-sidebar.spec.js +++ b/lib/common/components/StickySidebar/sticky-sidebar.spec.js @@ -49,7 +49,9 @@ describe('Common components', () => { it('should stick if scrolled more than scrollYOffset', () => { spyOn(component, 'stick').and.callThrough(); fixture.detectChanges(); - window.pageYOffset = 40; + component.scrollParent = { + pageYOffset: 40 + }; component.updatePosition(); expect(component.stick).toHaveBeenCalled(); });