summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gascou-Vaillancourt <paul.gascvail@gmail.com>2019-06-28 11:06:33 -0400
committerPaul Gascou-Vaillancourt <paul.gascvail@gmail.com>2019-06-28 11:06:33 -0400
commit844c0135dac3685fa31f743f26d5eadd73b40e23 (patch)
treef82c718a8ecba336a58d12f0d1d2f5ed7616c9ca
parente58839c0eaa65664b7afe66652582b48a34b15ad (diff)
downloadgitlab-ce-leipert-absolute-scss-paths.tar.gz
Remove modal-related testsleipert-absolute-scss-paths
-rw-r--r--spec/javascripts/registry/components/collapsible_container_spec.js18
-rw-r--r--spec/javascripts/registry/components/table_registry_spec.js20
2 files changed, 3 insertions, 35 deletions
diff --git a/spec/javascripts/registry/components/collapsible_container_spec.js b/spec/javascripts/registry/components/collapsible_container_spec.js
index 9ed4b04324a..8cdeee49bb7 100644
--- a/spec/javascripts/registry/components/collapsible_container_spec.js
+++ b/spec/javascripts/registry/components/collapsible_container_spec.js
@@ -71,23 +71,5 @@ describe('collapsible registry container', () => {
it('should be possible to delete a repo', () => {
expect(findDeleteBtn()).not.toBeNull();
});
-
- describe('clicked on delete', () => {
- beforeEach(done => {
- findDeleteBtn().click();
- Vue.nextTick(done);
- });
-
- it('should open confirmation modal', () => {
- expect(vm.$el.querySelector('#confirm-repo-deletion-modal')).not.toBeNull();
- });
-
- it('should call deleteItem when confirming deletion', () => {
- spyOn(vm, 'deleteItem').and.returnValue(Promise.resolve());
- vm.$el.querySelector('#confirm-repo-deletion-modal .btn-danger').click();
-
- expect(vm.deleteItem).toHaveBeenCalledWith(vm.repo);
- });
- });
});
});
diff --git a/spec/javascripts/registry/components/table_registry_spec.js b/spec/javascripts/registry/components/table_registry_spec.js
index d366c67a1b9..9e186c8025e 100644
--- a/spec/javascripts/registry/components/table_registry_spec.js
+++ b/spec/javascripts/registry/components/table_registry_spec.js
@@ -46,24 +46,10 @@ describe('table registry', () => {
expect(findDeleteBtn()).toBeDefined();
});
- describe('clicked on delete', () => {
- beforeEach(done => {
- findDeleteBtn().click();
- Vue.nextTick(done);
- });
+ it('should set itemToBeDeleted properly when clicking on delete button', () => {
+ findDeleteBtn().click();
- it('should open confirmation modal and set itemToBeDeleted properly', () => {
- expect(vm.itemToBeDeleted).toEqual(firstImage);
- expect(vm.$el.querySelector('#confirm-image-deletion-modal')).not.toBeNull();
- });
-
- it('should call deleteItem and reset itemToBeDeleted when confirming deletion', () => {
- spyOn(vm, 'deleteItem').and.returnValue(Promise.resolve());
- vm.$el.querySelector('#confirm-image-deletion-modal .btn-danger').click();
-
- expect(vm.deleteItem).toHaveBeenCalledWith(firstImage);
- expect(vm.itemToBeDeleted).toBeNull();
- });
+ expect(vm.itemToBeDeleted).toEqual(firstImage);
});
});