diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2018-05-23 09:11:52 +0000 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2018-05-23 09:11:52 +0000 |
commit | 3a3f542db6dd1a406f341cb59b18d9af7956e9fd (patch) | |
tree | f1556bd821bb26bae9234e5d21550a3273c2dc00 /spec/javascripts/ide | |
parent | 4ba8ff508c79b33e59e65497d7a102449cd4c155 (diff) | |
parent | fff2b4f6e4ef24e8648a9754fe32a2322a40d110 (diff) | |
download | gitlab-ce-3a3f542db6dd1a406f341cb59b18d9af7956e9fd.tar.gz |
Merge branch 'ide-commit-state-bug' into 'master'
Fixed web IDE review & commit editors getting into incorrect state
Closes #46392
See merge request gitlab-org/gitlab-ce!19038
Diffstat (limited to 'spec/javascripts/ide')
-rw-r--r-- | spec/javascripts/ide/components/repo_editor_spec.js | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/spec/javascripts/ide/components/repo_editor_spec.js b/spec/javascripts/ide/components/repo_editor_spec.js index ff500acd849..d3f80e6f9c0 100644 --- a/spec/javascripts/ide/components/repo_editor_spec.js +++ b/spec/javascripts/ide/components/repo_editor_spec.js @@ -346,4 +346,24 @@ describe('RepoEditor', () => { }); }); }); + + it('calls removePendingTab when old file is pending', done => { + spyOnProperty(vm, 'shouldHideEditor').and.returnValue(true); + spyOn(vm, 'removePendingTab'); + + vm.file.pending = true; + + vm + .$nextTick() + .then(() => { + vm.file = file('testing'); + + return vm.$nextTick(); + }) + .then(() => { + expect(vm.removePendingTab).toHaveBeenCalled(); + }) + .then(done) + .catch(done.fail); + }); }); |