From 9eae1812cdfe79a4ffc3e66c5a40242a36e72102 Mon Sep 17 00:00:00 2001
From: Mike Greiling <mike@pixelcog.com>
Date: Wed, 22 Mar 2017 03:26:12 -0500
Subject: [PATCH] fix test failures
---
app/assets/javascripts/dispatcher.js | 2 +-
app/assets/javascripts/user_callout.js | 4 +---
spec/javascripts/user_callout_spec.js | 3 +--
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js
index 3557f6f617e..d1a662459e1 100644
--- a/app/assets/javascripts/dispatcher.js
+++ b/app/assets/javascripts/dispatcher.js
@@ -41,9 +41,9 @@ import GroupsList from './groups_list';
import ProjectsList from './projects_list';
import MiniPipelineGraph from './mini_pipeline_graph_dropdown';
import BlobLinePermalinkUpdater from './blob/blob_line_permalink_updater';
+import UserCallout from './user_callout';
const ShortcutsBlob = require('./shortcuts_blob');
-const UserCallout = require('./user_callout');
(function() {
var Dispatcher;
diff --git a/app/assets/javascripts/user_callout.js b/app/assets/javascripts/user_callout.js
index 5c34e71c788..b27d252a3ef 100644
--- a/app/assets/javascripts/user_callout.js
+++ b/app/assets/javascripts/user_callout.js
@@ -27,7 +27,7 @@ const USER_CALLOUT_TEMPLATE = `
</div>
</div>`;
-class UserCallout {
+export default class UserCallout {
constructor() {
this.isCalloutDismissed = Cookies.get(USER_CALLOUT_COOKIE);
this.userCalloutBody = $(userCalloutElementName);
@@ -56,5 +56,3 @@ class UserCallout {
}
}
}
-
-module.exports = UserCallout;
diff --git a/spec/javascripts/user_callout_spec.js b/spec/javascripts/user_callout_spec.js
index ca6c299c594..2398149d3ad 100644
--- a/spec/javascripts/user_callout_spec.js
+++ b/spec/javascripts/user_callout_spec.js
@@ -1,6 +1,5 @@
import Cookies from 'js-cookie';
-
-const UserCallout = require('~/user_callout');
+import UserCallout from '~/user_callout';
const USER_CALLOUT_COOKIE = 'user_callout_dismissed';
--
GitLab