From e2037958f45a3490b2d5760965744295a38c6f34 Mon Sep 17 00:00:00 2001
From: zinyando <brizdigital@gmail.com>
Date: Fri, 13 May 2016 17:48:46 +0200
Subject: [PATCH] Added option to disable audit in tests

---
 app/app/services/audit.js |  2 +-
 app/config/environment.js | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/app/app/services/audit.js b/app/app/services/audit.js
index 1bf39d6a..7bb98016 100644
--- a/app/app/services/audit.js
+++ b/app/app/services/audit.js
@@ -16,7 +16,7 @@ import config from '../config/environment';
 export default Ember.Service.extend({
     sessionService: Ember.inject.service('session'),
     ready: false,
-    enabled: true,
+    enabled: config.APP.auditEnabled,
 
     init() {
         this.start();
diff --git a/app/config/environment.js b/app/config/environment.js
index 5ddcd95a..564eeea7 100644
--- a/app/config/environment.js
+++ b/app/config/environment.js
@@ -15,7 +15,7 @@ module.exports = function(environment) {
     var ENV = {
         modulePrefix: 'documize',
         podModulePrefix: 'documize/pods',
-        locationType: 'history',
+        locationType: 'auto',
         environment: environment,
         baseURL: '/',
         apiHost: '',
@@ -28,12 +28,18 @@ module.exports = function(environment) {
          "ember-cli-mirage": {
             enabled: false
         },
-        APP: {}
+        APP: {
+            // Allows to disable audit service in tests
+            auditEnabled: true
+        }
     };
 
     if (environment === 'development') {
         ENV.APP.LOG_TRANSITIONS = true;
         ENV.APP.LOG_TRANSITIONS_INTERNAL = true;
+        ENV['ember-cli-mirage'] = {
+          enabled: false
+        };
 
         ENV.apiHost = "https://localhost:5001";
         // ENV.apiHost = "https://demo1.dev:5001";
@@ -52,9 +58,9 @@ module.exports = function(environment) {
         ENV['ember-cli-mirage'] = {
           enabled: true
         };
+        ENV.APP.auditEnabled = false;
 
         ENV.apiHost = "https://localhost:5001";
-        // ENV.apiHost = "https://demo1.dev:5001";
     }
 
     if (environment === 'production') {