From 7792a82af9fd81c507816665bb77e055111b8be6 Mon Sep 17 00:00:00 2001
From: Areeb Jamal <jamal.areeb@gmail.com>
Date: Sat, 15 Feb 2020 17:57:11 +0530
Subject: [PATCH] Revert "fix: remove duplicate import and no relative import
 (#4015)"

This reverts commit 3ce9b50efde9b8eb1f8776c26a09db803b6fdee3.
---
 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, 7 insertions(+), 19 deletions(-)
 delete mode 100644 tests/app.js

diff --git a/app/initializers/extensions.js b/app/initializers/extensions.js
index 93081e440ab..da05e0dca93 100644
--- a/app/initializers/extensions.js
+++ b/app/initializers/extensions.js
@@ -1,4 +1,4 @@
-import 'open-event-frontend/extensions/ember-table/component';
+import '../extensions/ember-table/component';
 
 export function initialize() {}
 
diff --git a/app/services/current-user.js b/app/services/current-user.js
index 5cb97b52fda..61c11095e97 100644
--- a/app/services/current-user.js
+++ b/app/services/current-user.js
@@ -1,4 +1,5 @@
-import Service, { inject as service } from '@ember/service';
+import Service from '@ember/service';
+import { 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 468d5e474df..e6daef3ba1c 100644
--- a/app/services/device.js
+++ b/app/services/device.js
@@ -1,9 +1,10 @@
 import $ from 'jquery';
-import Service, { inject as service } from '@ember/service';
+import 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
deleted file mode 100644
index 68741aa9813..00000000000
--- a/tests/app.js
+++ /dev/null
@@ -1,14 +0,0 @@
-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 12ed0c44f22..a6453f33b54 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 'open-event-frontend/config/environment';
+import config from '../config/environment';
 import { setApplication } from '@ember/test-helpers';
 import { start } from 'ember-qunit';
 import loadEmberExam from 'ember-exam/test-support/load';