From 3ce9b50efde9b8eb1f8776c26a09db803b6fdee3 Mon Sep 17 00:00:00 2001
From: Sundaram Dubey <56407566+maze-runnar@users.noreply.github.com>
Date: Sat, 15 Feb 2020 17:43:16 +0530
Subject: [PATCH] fix: remove duplicate import and no relative import (#4015)

---
 app/initializers/extensions.js |  2 +-
 app/services/current-user.js   |  3 +--
 app/services/device.js         |  3 +--
 tests/app.js                   | 14 ++++++++++++++
 tests/test-helper.js           |  4 ++--
 5 files changed, 19 insertions(+), 7 deletions(-)
 create mode 100644 tests/app.js

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() {}
 
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';
 
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
diff --git a/tests/app.js b/tests/app.js
new file mode 100644
index 00000000000..68741aa9813
--- /dev/null
+++ b/tests/app.js
@@ -0,0 +1,14 @@
+import Application from '@ember/application';
+import Resolver from 'ember-resolver';
+import loadInitializers from 'ember-load-initializers';
+import config from 'open-event-frontend/config/environment';
+
+const App = Application.extend({
+  modulePrefix    : config.modulePrefix,
+  podModulePrefix : config.podModulePrefix,
+  Resolver
+});
+
+loadInitializers(App, config.modulePrefix);
+
+export default App;
diff --git a/tests/test-helper.js b/tests/test-helper.js
index a6453f33b54..12ed0c44f22 100644
--- a/tests/test-helper.js
+++ b/tests/test-helper.js
@@ -1,6 +1,6 @@
-import Application from '../app';
+import Application from './app';
 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';