From 6fa06fc4e8d0c694d4d330f3eabbbb0d88af8de1 Mon Sep 17 00:00:00 2001
From: Felix Hammerl <felix@whiteout.io>
Date: Wed, 20 Nov 2013 14:58:31 +0100
Subject: [PATCH] [WO-18] rename methods in email dao

---
 src/js/bo/outbox.js             |  2 +-
 src/js/dao/email-dao.js         |  2 +-
 test/new-unit/email-dao-test.js | 10 +++++-----
 test/new-unit/outbox-bo-test.js |  4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/js/bo/outbox.js b/src/js/bo/outbox.js
index 8f18013..63fd5fe 100644
--- a/src/js/bo/outbox.js
+++ b/src/js/bo/outbox.js
@@ -62,7 +62,7 @@ define(function(require) {
             }
 
             var email = emails.shift();
-            self._emailDao.smtpSend(email, function(err) {
+            self._emailDao.encryptedSend(email, function(err) {
                 if (err) {
                     self._outboxBusy = false;
                     callback(err);
diff --git a/src/js/dao/email-dao.js b/src/js/dao/email-dao.js
index 3b9552a..daa50de 100644
--- a/src/js/dao/email-dao.js
+++ b/src/js/dao/email-dao.js
@@ -534,7 +534,7 @@ define(function(require) {
     /**
      * Send an email client side via STMP.
      */
-    EmailDAO.prototype.smtpSend = function(email, callback) {
+    EmailDAO.prototype.encryptedSend = function(email, callback) {
         var self = this,
             invalidRecipient;
 
diff --git a/test/new-unit/email-dao-test.js b/test/new-unit/email-dao-test.js
index cc2ae82..f32265e 100644
--- a/test/new-unit/email-dao-test.js
+++ b/test/new-unit/email-dao-test.js
@@ -255,7 +255,7 @@ define(function(require) {
 
             describe('SMTP: send email', function() {
                 it('should fail due to bad input', function(done) {
-                    emailDao.smtpSend({}, function(err) {
+                    emailDao.encryptedSend({}, function(err) {
                         expect(smtpClientStub.send.called).to.be.false;
                         expect(keychainStub.getReceiverPublicKey.called).to.be.false;
                         expect(err).to.exist;
@@ -267,7 +267,7 @@ define(function(require) {
                     dummyMail.to = [{
                         address: 'asfd'
                     }];
-                    emailDao.smtpSend(dummyMail, function(err) {
+                    emailDao.encryptedSend(dummyMail, function(err) {
                         expect(smtpClientStub.send.called).to.be.false;
                         expect(keychainStub.getReceiverPublicKey.called).to.be.false;
                         expect(err).to.exist;
@@ -279,7 +279,7 @@ define(function(require) {
                     keychainStub.getReceiverPublicKey.yields(null, null);
                     smtpClientStub.send.yields();
 
-                    emailDao.smtpSend(dummyMail, function(err) {
+                    emailDao.encryptedSend(dummyMail, function(err) {
                         expect(keychainStub.getReceiverPublicKey.calledOnce).to.be.true;
                         // expect(smtpClientStub.send.called).to.be.true;
                         // smtpClientStub.send.calledWith(sinon.match(function(o) {
@@ -300,7 +300,7 @@ define(function(require) {
                     pgpStub.encrypt.yields(null, 'asdfasfd');
                     smtpClientStub.send.yields();
 
-                    emailDao.smtpSend(dummyMail, function(err) {
+                    emailDao.encryptedSend(dummyMail, function(err) {
                         expect(keychainStub.getReceiverPublicKey.calledOnce).to.be.true;
                         expect(pgpStub.exportKeys.calledOnce).to.be.true;
                         expect(pgpStub.encrypt.calledOnce).to.be.true;
@@ -328,7 +328,7 @@ define(function(require) {
                 //     pgpStub.encrypt.yields(null, 'asdfasfd');
                 //     smtpClientStub.send.yields();
 
-                //     emailDao.smtpSend(dummyMail, function(err) {
+                //     emailDao.encryptedSend(dummyMail, function(err) {
                 //         expect(keychainStub.getReceiverPublicKey.calledOnce).to.be.true;
                 //         expect(pgpStub.exportKeys.calledOnce).to.be.true;
                 //         expect(pgpStub.encrypt.calledOnce).to.be.true;
diff --git a/test/new-unit/outbox-bo-test.js b/test/new-unit/outbox-bo-test.js
index ed941ce..db9fedf 100644
--- a/test/new-unit/outbox-bo-test.js
+++ b/test/new-unit/outbox-bo-test.js
@@ -47,14 +47,14 @@ define(function(require) {
                 devicestorageStub.listItems.yields(null, [{
                     id: '12345'
                 }]);
-                emailDaoStub.smtpSend.yields();
+                emailDaoStub.encryptedSend.yields();
                 devicestorageStub.removeList.yields();
 
                 function onOutboxUpdate(err, count) {
                     expect(err).to.not.exist;
                     if (count === 0) {
                         expect(devicestorageStub.listItems.callCount).to.equal(1);
-                        expect(emailDaoStub.smtpSend.callCount).to.equal(1);
+                        expect(emailDaoStub.encryptedSend.callCount).to.equal(1);
                         expect(devicestorageStub.removeList.callCount).to.equal(1);
                         done();
                     }