Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-05-02 19:16:54 +0300
committerPhil Hughes <me@iamphill.com>2018-05-02 19:16:54 +0300
commitc7c9f38d01938963a8cdf7f5a3bd12ea53e22e59 (patch)
tree3e0d81c5ad5bdf00c5c32e8b35c6952d55f69fa6 /spec
parent66ba430d7fe53d5e953f49ba1fb1be218e70786e (diff)
parent1f08fab43fbc13e01e5ec7ca3aec5dbd6762eb26 (diff)
Merge branch 'revert-75f6e91f' into 'master'
Revert "Merge branch '5480-sidebar-subscription-event-handling' into 'master'" Closes #45979 See merge request gitlab-org/gitlab-ce!18692
Diffstat (limited to 'spec')
-rw-r--r--spec/javascripts/sidebar/sidebar_subscriptions_spec.js3
-rw-r--r--spec/javascripts/sidebar/subscriptions_spec.js8
2 files changed, 2 insertions, 9 deletions
diff --git a/spec/javascripts/sidebar/sidebar_subscriptions_spec.js b/spec/javascripts/sidebar/sidebar_subscriptions_spec.js
index 9e437084224..56a2543660b 100644
--- a/spec/javascripts/sidebar/sidebar_subscriptions_spec.js
+++ b/spec/javascripts/sidebar/sidebar_subscriptions_spec.js
@@ -3,6 +3,7 @@ import sidebarSubscriptions from '~/sidebar/components/subscriptions/sidebar_sub
import SidebarMediator from '~/sidebar/sidebar_mediator';
import SidebarService from '~/sidebar/services/sidebar_service';
import SidebarStore from '~/sidebar/stores/sidebar_store';
+import eventHub from '~/sidebar/event_hub';
import mountComponent from 'spec/helpers/vue_mount_component_helper';
import Mock from './mock_data';
@@ -31,7 +32,7 @@ describe('Sidebar Subscriptions', function () {
mediator,
});
- vm.onToggleSubscription();
+ eventHub.$emit('toggleSubscription');
expect(mediator.toggleSubscription).toHaveBeenCalled();
});
diff --git a/spec/javascripts/sidebar/subscriptions_spec.js b/spec/javascripts/sidebar/subscriptions_spec.js
index 11ff126dfb5..aee8f0acbb9 100644
--- a/spec/javascripts/sidebar/subscriptions_spec.js
+++ b/spec/javascripts/sidebar/subscriptions_spec.js
@@ -39,12 +39,4 @@ describe('Subscriptions', function () {
expect(vm.$refs.toggleButton.$el.querySelector('.project-feature-toggle')).toHaveClass('is-checked');
});
-
- it('toggleSubscription method emits `toggleSubscription` event on component', () => {
- vm = mountComponent(Subscriptions, { subscribed: true });
- spyOn(vm, '$emit');
-
- vm.toggleSubscription();
- expect(vm.$emit).toHaveBeenCalledWith('toggleSubscription', jasmine.any(Object));
- });
});