From 40a4b337482528128ac00ecf19b064a45dcf05fb Mon Sep 17 00:00:00 2001
From: Felix Hammerl <mail@felixhammerl.com>
Date: Wed, 5 Nov 2014 14:27:34 +0100
Subject: [PATCH] Use chai 1.9.x

---
 package.json                         | 2 +-
 test/integration/email-dao-test.js   | 2 +-
 test/unit/backbutton-handler-test.js | 2 +-
 test/unit/email-dao-test.js          | 2 +-
 test/unit/mail-list-ctrl-test.js     | 2 +-
 test/unit/outbox-bo-test.js          | 4 ++--
 test/unit/update-handler-test.js     | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index ac49c0b..2d7b7ef 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,7 @@
         "angularjs": "https://github.com/whiteout-io/angular.js/tarball/npm-version",
         "browsercrow": "https://github.com/whiteout-io/browsercrow/tarball/master",
         "browsersmtp": "https://github.com/whiteout-io/browsersmtp/tarball/master",
-        "chai": "~1.7.2",
+        "chai": "~1.9.2",
         "grunt": "~0.4.1",
         "grunt-browserify": "^3.0.1",
         "grunt-contrib-clean": "~0.5.0",
diff --git a/test/integration/email-dao-test.js b/test/integration/email-dao-test.js
index de4c63c..1f86895 100644
--- a/test/integration/email-dao-test.js
+++ b/test/integration/email-dao-test.js
@@ -14,7 +14,7 @@ var ImapClient = require('imap-client'),
 
 describe('Email DAO integration tests', function() {
     this.timeout(100000);
-    chai.Assertion.includeStack = true;
+    chai.config.includeStack = true;
 
     var emailDao, imapClient, imapMessages, imapFolders, imapServer, smtpServer, smtpClient, userStorage,
         mockKeyPair, inbox, spam;
diff --git a/test/unit/backbutton-handler-test.js b/test/unit/backbutton-handler-test.js
index 66fc05b..9cb0892 100644
--- a/test/unit/backbutton-handler-test.js
+++ b/test/unit/backbutton-handler-test.js
@@ -3,7 +3,7 @@
 var btnHandler = require('../../src/js/util/backbutton-handler');
 
 describe('Backbutton Handler', function() {
-    chai.Assertion.includeStack = true;
+    chai.config.includeStack = true;
 
     var scope, event;
 
diff --git a/test/unit/email-dao-test.js b/test/unit/email-dao-test.js
index 4c86eed..2b53f77 100644
--- a/test/unit/email-dao-test.js
+++ b/test/unit/email-dao-test.js
@@ -13,7 +13,7 @@ var mailreader = require('mailreader'),
 
 describe('Email DAO unit tests', function() {
     // show the stack trace when an error occurred
-    chai.Assertion.includeStack = true;
+    chai.config.includeStack = true;
 
     // SUT
     var dao;
diff --git a/test/unit/mail-list-ctrl-test.js b/test/unit/mail-list-ctrl-test.js
index d05c1a8..6eadd76 100644
--- a/test/unit/mail-list-ctrl-test.js
+++ b/test/unit/mail-list-ctrl-test.js
@@ -8,7 +8,7 @@ var mocks = angular.mock,
     appController = require('../../src/js/app-controller'),
     notification = require('../../src/js/util/notification');
 
-chai.Assertion.includeStack = true;
+chai.config.includeStack = true;
 
 describe('Mail List controller unit test', function() {
     var scope, ctrl, origEmailDao, emailDaoMock, keychainMock, deviceStorageMock,
diff --git a/test/unit/outbox-bo-test.js b/test/unit/outbox-bo-test.js
index 55cc2a5..e5df498 100644
--- a/test/unit/outbox-bo-test.js
+++ b/test/unit/outbox-bo-test.js
@@ -5,12 +5,12 @@ var OutboxBO = require('../../src/js/bo/outbox'),
     EmailDAO = require('../../src/js/dao/email-dao'),
     DeviceStorageDAO = require('../../src/js/dao/devicestorage-dao');
 
-chai.Assertion.includeStack = true;
-
 describe('Outbox Business Object unit test', function() {
     var outbox, emailDaoStub, devicestorageStub, keychainStub,
         dummyUser = 'spiderpig@springfield.com';
 
+    chai.config.includeStack = true;
+
     beforeEach(function() {
         emailDaoStub = sinon.createStubInstance(EmailDAO);
         emailDaoStub._account = {
diff --git a/test/unit/update-handler-test.js b/test/unit/update-handler-test.js
index 8267938..7f1407a 100644
--- a/test/unit/update-handler-test.js
+++ b/test/unit/update-handler-test.js
@@ -9,7 +9,7 @@ var DeviceStorageDAO = require('../../src/js/dao/devicestorage-dao'),
 describe('UpdateHandler', function() {
     var updateHandler, appConfigStorageStub, authStub, userStorageStub, origDbVersion;
 
-    chai.Assertion.includeStack = true;
+    chai.config.includeStack = true;
 
     beforeEach(function() {
         origDbVersion = cfg.dbVersion;