summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorLuke "Jared" Bennett <lbennett@gitlab.com>2017-05-26 16:47:34 +0100
committerLuke "Jared" Bennett <lbennett@gitlab.com>2017-05-26 16:48:19 +0100
commit870005c432be685434e3435f53ebe69371475e62 (patch)
tree3321f3cd01c1d8ba2b46a520ff4ff2eff2484e32 /app
parent71d03e7e18827e811a3995925de37e080c3e9723 (diff)
downloadgitlab-ce-870005c432be685434e3435f53ebe69371475e62.tar.gz
Added specs for handleNotifications in mr_widget_options_spec.js
Diffstat (limited to 'app')
-rw-r--r--app/assets/javascripts/lib/utils/notify.js8
-rw-r--r--app/assets/javascripts/vue_merge_request_widget/dependencies.js2
-rw-r--r--app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js4
3 files changed, 10 insertions, 4 deletions
diff --git a/app/assets/javascripts/lib/utils/notify.js b/app/assets/javascripts/lib/utils/notify.js
index 2aa1bb00093..973d6119158 100644
--- a/app/assets/javascripts/lib/utils/notify.js
+++ b/app/assets/javascripts/lib/utils/notify.js
@@ -39,4 +39,10 @@ function notifyMe(message, body, icon, onclick) {
}
}
-export { notifyMe as default, notifyPermissions, notificationGranted };
+const notify = {
+ notificationGranted,
+ notifyPermissions,
+ notifyMe,
+};
+
+export default notify;
diff --git a/app/assets/javascripts/vue_merge_request_widget/dependencies.js b/app/assets/javascripts/vue_merge_request_widget/dependencies.js
index 994e3bff550..fe5e1bbb55c 100644
--- a/app/assets/javascripts/vue_merge_request_widget/dependencies.js
+++ b/app/assets/javascripts/vue_merge_request_widget/dependencies.js
@@ -41,4 +41,4 @@ export { default as getStateKey } from './stores/get_state_key';
export { default as mrWidgetOptions } from './mr_widget_options';
export { default as stateMaps } from './stores/state_maps';
export { default as SquashBeforeMerge } from './components/states/mr_widget_squash_before_merge';
-export { default as notifyMe } from '../lib/utils/notify';
+export { default as notify } from '../lib/utils/notify';
diff --git a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js
index 0578598c772..2339a00ddd0 100644
--- a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js
+++ b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js
@@ -29,7 +29,7 @@ import {
eventHub,
stateMaps,
SquashBeforeMerge,
- notifyMe,
+ notify,
} from './dependencies';
export default {
@@ -146,7 +146,7 @@ export default {
const title = `Pipeline ${label}`;
const message = `Pipeline ${label} for "${data.title}"`;
- notifyMe(title, message, this.mr.gitlabLogo);
+ notify.notifyMe(title, message, this.mr.gitlabLogo);
},
resumePolling() {
this.pollingInterval.resume();