diff options
author | Phil Hughes <me@iamphill.com> | 2019-04-05 07:39:40 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2019-04-05 07:39:40 +0000 |
commit | 36d1d9082cc0d12ebce52050730ae50a0cc51d1a (patch) | |
tree | b8b600b07b258609c892869532250218c076f144 /spec/javascripts/ide | |
parent | 5402c918d5a202ed381e0b95d528fa43f644c047 (diff) | |
parent | c1a097e1cee43b127de17d769546ffa244cbf484 (diff) | |
download | gitlab-ce-36d1d9082cc0d12ebce52050730ae50a0cc51d1a.tar.gz |
Merge branch '60021-fix-ide-file-dropdown' into 'master'
Fix IDE file dropdown
Closes #60021
See merge request gitlab-org/gitlab-ce!27015
Diffstat (limited to 'spec/javascripts/ide')
-rw-r--r-- | spec/javascripts/ide/components/file_row_extra_spec.js | 2 | ||||
-rw-r--r-- | spec/javascripts/ide/components/new_dropdown/index_spec.js | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/spec/javascripts/ide/components/file_row_extra_spec.js b/spec/javascripts/ide/components/file_row_extra_spec.js index c93a939ad71..d7fed3f0681 100644 --- a/spec/javascripts/ide/components/file_row_extra_spec.js +++ b/spec/javascripts/ide/components/file_row_extra_spec.js @@ -20,7 +20,7 @@ describe('IDE extra file row component', () => { file: { ...file('test'), }, - mouseOver: false, + dropdownOpen: false, }); spyOnProperty(vm, 'getUnstagedFilesCountForPath').and.returnValue(() => unstagedFilesCount); diff --git a/spec/javascripts/ide/components/new_dropdown/index_spec.js b/spec/javascripts/ide/components/new_dropdown/index_spec.js index 83e530f0a6a..aaebe88f314 100644 --- a/spec/javascripts/ide/components/new_dropdown/index_spec.js +++ b/spec/javascripts/ide/components/new_dropdown/index_spec.js @@ -56,11 +56,11 @@ describe('new dropdown component', () => { }); }); - describe('dropdownOpen', () => { + describe('isOpen', () => { it('scrolls dropdown into view', done => { spyOn(vm.$refs.dropdownMenu, 'scrollIntoView'); - vm.dropdownOpen = true; + vm.isOpen = true; setTimeout(() => { expect(vm.$refs.dropdownMenu.scrollIntoView).toHaveBeenCalledWith({ |