From adb8483331a7d25f84029ecf67b33e1f09a1e99f Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Thu, 14 Dec 2017 11:50:40 +0000
Subject: Converted JS modules into exported modules

---
 spec/javascripts/activities_spec.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'spec/javascripts/activities_spec.js')

diff --git a/spec/javascripts/activities_spec.js b/spec/javascripts/activities_spec.js
index e8c5f721423..fc9be14df8f 100644
--- a/spec/javascripts/activities_spec.js
+++ b/spec/javascripts/activities_spec.js
@@ -2,7 +2,7 @@
 
 import 'vendor/jquery.endless-scroll';
 import '~/pager';
-import '~/activities';
+import Activities from '~/activities';
 
 (() => {
   window.gon || (window.gon = {});
@@ -35,7 +35,7 @@ import '~/activities';
   describe('Activities', () => {
     beforeEach(() => {
       loadFixtures(fixtureTemplate);
-      new gl.Activities();
+      new Activities();
     });
 
     for (let i = 0; i < filters.length; i += 1) {
-- 
cgit v1.2.1


From 29e1a63d3d3dac857e0a9189e1b306f072700801 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 15 Dec 2017 09:31:58 +0000
Subject: Export JS classes as modules

#38869
---
 spec/javascripts/activities_spec.js | 1 -
 1 file changed, 1 deletion(-)

(limited to 'spec/javascripts/activities_spec.js')

diff --git a/spec/javascripts/activities_spec.js b/spec/javascripts/activities_spec.js
index fc9be14df8f..7a9c539e9d0 100644
--- a/spec/javascripts/activities_spec.js
+++ b/spec/javascripts/activities_spec.js
@@ -1,7 +1,6 @@
 /* eslint-disable no-unused-expressions, no-prototype-builtins, no-new, no-shadow, max-len */
 
 import 'vendor/jquery.endless-scroll';
-import '~/pager';
 import Activities from '~/activities';
 
 (() => {
-- 
cgit v1.2.1