From 970f9683c39f1ef2ebdc9763200fa1e0817c5bc7 Mon Sep 17 00:00:00 2001
From: Sundaram Dubey <56407566+maze-runnar@users.noreply.github.com>
Date: Sat, 15 Feb 2020 21:31:57 +0530
Subject: [PATCH 1/6] remove relative import

---
 app/initializers/extensions.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/initializers/extensions.js b/app/initializers/extensions.js
index da05e0dca93..93081e440ab 100644
--- a/app/initializers/extensions.js
+++ b/app/initializers/extensions.js
@@ -1,4 +1,4 @@
-import '../extensions/ember-table/component';
+import 'open-event-frontend/extensions/ember-table/component';
 
 export function initialize() {}
 

From a701efc725c9deacff434fed53088ed9561915e0 Mon Sep 17 00:00:00 2001
From: Sundaram Dubey <56407566+maze-runnar@users.noreply.github.com>
Date: Sat, 15 Feb 2020 21:35:11 +0530
Subject: [PATCH 2/6] removing duplicate import

---
 app/services/current-user.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/services/current-user.js b/app/services/current-user.js
index 61c11095e97..5cb97b52fda 100644
--- a/app/services/current-user.js
+++ b/app/services/current-user.js
@@ -1,5 +1,4 @@
-import Service from '@ember/service';
-import { inject as service } from '@ember/service';
+import Service, { inject as service } from '@ember/service';
 import { isEmpty } from '@ember/utils';
 import { resolve } from 'rsvp';
 

From 0df9e3ce4068656310ad92a4397cbe394651ed4b Mon Sep 17 00:00:00 2001
From: Sundaram Dubey <56407566+maze-runnar@users.noreply.github.com>
Date: Sat, 15 Feb 2020 21:36:10 +0530
Subject: [PATCH 3/6] remove duplicate import

---
 app/services/device.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/services/device.js b/app/services/device.js
index e6daef3ba1c..468d5e474df 100644
--- a/app/services/device.js
+++ b/app/services/device.js
@@ -1,10 +1,9 @@
 import $ from 'jquery';
-import Service from '@ember/service';
+import Service, { inject as service } from '@ember/service';
 import { computed } from '@ember/object';
 import { equal, or } from '@ember/object/computed';
 import { debounce } from '@ember/runloop';
 import { forOwn } from 'lodash-es';
-import { inject as service } from '@ember/service';
 
 /**
  * Keeping this outside the service object to keep it lean and faster to loop over

From 27cf2e5ddbe1167043ebb7795a24df18983de862 Mon Sep 17 00:00:00 2001
From: Sundaram Dubey <56407566+maze-runnar@users.noreply.github.com>
Date: Sat, 15 Feb 2020 21:37:19 +0530
Subject: [PATCH 4/6] remove relative import

---
 tests/test-helper.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/tests/test-helper.js b/tests/test-helper.js
index a6453f33b54..a6feda85a40 100644
--- a/tests/test-helper.js
+++ b/tests/test-helper.js
@@ -1,9 +1,16 @@
-import Application from '../app';
+import Application from '@ember/application';
 import QUnit from 'qunit';
-import config from '../config/environment';
+import config from 'open-event-frontend/config/environment';
 import { setApplication } from '@ember/test-helpers';
 import { start } from 'ember-qunit';
 import loadEmberExam from 'ember-exam/test-support/load';
+import Resolver from 'ember-resolver';
+
+Application.extend({
+  modulePrefix    : config.modulePrefix,
+  podModulePrefix : config.podModulePrefix,
+  Resolver
+});
 
 QUnit.config.testTimeout = 300000;
 

From d6b70cbd118cae4a2f135d85d4411ef197b81327 Mon Sep 17 00:00:00 2001
From: Sundaram Dubey <56407566+maze-runnar@users.noreply.github.com>
Date: Sat, 15 Feb 2020 22:18:16 +0530
Subject: [PATCH 5/6] Update test-helper.js

---
 tests/test-helper.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/test-helper.js b/tests/test-helper.js
index a6feda85a40..eaab6514076 100644
--- a/tests/test-helper.js
+++ b/tests/test-helper.js
@@ -5,13 +5,16 @@ import { setApplication } from '@ember/test-helpers';
 import { start } from 'ember-qunit';
 import loadEmberExam from 'ember-exam/test-support/load';
 import Resolver from 'ember-resolver';
+import loadInitializers from 'ember-load-initializers';
 
-Application.extend({
+const App = Application.extend({
   modulePrefix    : config.modulePrefix,
   podModulePrefix : config.podModulePrefix,
   Resolver
 });
 
+loadInitializers(App, config.modulePrefix);
+
 QUnit.config.testTimeout = 300000;
 
 setApplication(Application.create(config.APP));

From 84a7306849a1b8bfb539b5aee3406c6865544bb7 Mon Sep 17 00:00:00 2001
From: Sundaram Dubey <56407566+maze-runnar@users.noreply.github.com>
Date: Sat, 15 Feb 2020 22:42:03 +0530
Subject: [PATCH 6/6] Update test-helper.js

---
 tests/test-helper.js | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/tests/test-helper.js b/tests/test-helper.js
index eaab6514076..3ee8574f9bc 100644
--- a/tests/test-helper.js
+++ b/tests/test-helper.js
@@ -1,19 +1,9 @@
-import Application from '@ember/application';
+import Application from 'open-event-frontend/app';
 import QUnit from 'qunit';
 import config from 'open-event-frontend/config/environment';
 import { setApplication } from '@ember/test-helpers';
 import { start } from 'ember-qunit';
 import loadEmberExam from 'ember-exam/test-support/load';
-import Resolver from 'ember-resolver';
-import loadInitializers from 'ember-load-initializers';
-
-const App = Application.extend({
-  modulePrefix    : config.modulePrefix,
-  podModulePrefix : config.podModulePrefix,
-  Resolver
-});
-
-loadInitializers(App, config.modulePrefix);
 
 QUnit.config.testTimeout = 300000;