diff options
author | Sam Bigelow <sbigelow@gitlab.com> | 2019-04-10 16:39:03 -0400 |
---|---|---|
committer | Sam Bigelow <sbigelow@gitlab.com> | 2019-04-10 16:49:04 -0400 |
commit | b4e5ca5564e0f967868ed87e873de8cc663b92be (patch) | |
tree | fc59e91ac3167221afb3b724289b09ee1afcea6d | |
parent | ddab30ad3561c6834fd779458ce89084c8a95ca5 (diff) | |
download | gitlab-ce-60369-border-radius-still-showing-up-after-improve-diff-nav-header-was-finished.tar.gz |
Fix isDesktop function to return proper value60369-border-radius-still-showing-up-after-improve-diff-nav-header-was-finished
3 files changed, 20 insertions, 1 deletions
diff --git a/app/assets/javascripts/breakpoints.js b/app/assets/javascripts/breakpoints.js index 4d5d6bb864b..93aacba0e8e 100644 --- a/app/assets/javascripts/breakpoints.js +++ b/app/assets/javascripts/breakpoints.js @@ -15,7 +15,7 @@ const BreakpointInstance = { return breakpoint; }, isDesktop() { - return ['lg', 'md'].includes(this.getBreakpointSize); + return ['lg', 'md'].includes(this.getBreakpointSize()); }, }; diff --git a/changelogs/unreleased/60369-border-radius-still-showing-up-after-improve-diff-nav-header-was-finished.yml b/changelogs/unreleased/60369-border-radius-still-showing-up-after-improve-diff-nav-header-was-finished.yml new file mode 100644 index 00000000000..d869b794374 --- /dev/null +++ b/changelogs/unreleased/60369-border-radius-still-showing-up-after-improve-diff-nav-header-was-finished.yml @@ -0,0 +1,5 @@ +--- +title: Fix bug in isDesktop function +merge_request: 27240 +author: +type: fixed diff --git a/spec/javascripts/breakpoints_spec.js b/spec/javascripts/breakpoints_spec.js index 5ee777fee3f..fc0d9eb907a 100644 --- a/spec/javascripts/breakpoints_spec.js +++ b/spec/javascripts/breakpoints_spec.js @@ -10,4 +10,18 @@ describe('breakpoints', () => { expect(bp.getBreakpointSize()).toBe(key); }); }); + + describe('isDesktop', () => { + it('returns true when screen size is medium', () => { + spyOn(bp, 'windowWidth').and.returnValue(breakpoints.md + 10); + + expect(bp.isDesktop()).toBe(true); + }); + + it('returns false when screen size is small', () => { + spyOn(bp, 'windowWidth').and.returnValue(breakpoints.sm + 10); + + expect(bp.isDesktop()).toBe(false); + }); + }); }); |