From 495bc391e140cc2bb462c81fa90410a0fe8f6a4c Mon Sep 17 00:00:00 2001
From: Duda Dornelles <ddornell@thoughtworks.com>
Date: Mon, 20 Oct 2014 12:17:18 +0200
Subject: massive update of bower and npm libs - includes flight, jasmine and a
 bunch of stuff. If things get weird when developing, remove you
 bower_components and your node_modules and install it again

---
 .../test/spec/mail_view/data/mail_sender.spec.js   | 26 +++++++++++-----------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'web-ui/test/spec/mail_view/data/mail_sender.spec.js')

diff --git a/web-ui/test/spec/mail_view/data/mail_sender.spec.js b/web-ui/test/spec/mail_view/data/mail_sender.spec.js
index f5a0dd92..3f6a2eaa 100644
--- a/web-ui/test/spec/mail_view/data/mail_sender.spec.js
+++ b/web-ui/test/spec/mail_view/data/mail_sender.spec.js
@@ -9,14 +9,14 @@ describeComponent('mail_view/data/mail_sender', function () {
   beforeEach(function () {
     mailBuilder =  require('mail_view/data/mail_builder');
     mail = Pixelated.testData().parsedMail.simpleTextPlain;
-    setupComponent();
+    this.setupComponent();
   });
 
   it('sends mail data with a POST to the server when asked to send email', function() {
     var mailSentEventSpy = spyOnEvent(document, Pixelated.events.mail.sent);
     var g;
 
-    spyOn($, 'ajax').andReturn({done: function(f) { g = f; return {fail: function(){}};}});
+    spyOn($, 'ajax').and.returnValue({done: function(f) { g = f; return {fail: function(){}};}});
 
     this.component.trigger(Pixelated.events.mail.send, mail);
 
@@ -24,17 +24,17 @@ describeComponent('mail_view/data/mail_sender', function () {
 
     expect(mailSentEventSpy).toHaveBeenTriggeredOn(document);
 
-    expect($.ajax.mostRecentCall.args[0]).toEqual('/mails');
-    expect($.ajax.mostRecentCall.args[1].type).toEqual('POST');
-    expect(JSON.parse($.ajax.mostRecentCall.args[1].data).header).toEqual(mail.header);
-    expect(JSON.parse($.ajax.mostRecentCall.args[1].data).body).toEqual(mail.body);
+    expect($.ajax.calls.mostRecent().args[0]).toEqual('/mails');
+    expect($.ajax.calls.mostRecent().args[1].type).toEqual('POST');
+    expect(JSON.parse($.ajax.calls.mostRecent().args[1].data).header).toEqual(mail.header);
+    expect(JSON.parse($.ajax.calls.mostRecent().args[1].data).body).toEqual(mail.body);
   });
 
   it('save draft data with a PUT to the server', function() {
     var draftSavedEventSpy = spyOnEvent(document, Pixelated.events.mail.draftSaved);
     var g;
 
-    spyOn($, 'ajax').andReturn({done: function(f) { g = f; return {fail: function(){}};}});
+    spyOn($, 'ajax').and.returnValue({done: function(f) { g = f; return {fail: function(){}};}});
 
     mail.ident = 0;
     this.component.trigger(Pixelated.events.mail.saveDraft, mail);
@@ -43,10 +43,10 @@ describeComponent('mail_view/data/mail_sender', function () {
 
     expect(draftSavedEventSpy).toHaveBeenTriggeredOn(document);
 
-    expect($.ajax.mostRecentCall.args[0]).toEqual('/mails');
-    expect($.ajax.mostRecentCall.args[1].type).toEqual('PUT');
-    expect(JSON.parse($.ajax.mostRecentCall.args[1].data).header).toEqual(mail.header);
-    expect(JSON.parse($.ajax.mostRecentCall.args[1].data).body).toEqual(mail.body);
+    expect($.ajax.calls.mostRecent().args[0]).toEqual('/mails');
+    expect($.ajax.calls.mostRecent().args[1].type).toEqual('PUT');
+    expect(JSON.parse($.ajax.calls.mostRecent().args[1].data).header).toEqual(mail.header);
+    expect(JSON.parse($.ajax.calls.mostRecent().args[1].data).body).toEqual(mail.body);
   });
 
   it('displays generic error message when sending an email fails in the service', function () {
@@ -55,7 +55,7 @@ describeComponent('mail_view/data/mail_sender', function () {
     deferred.reject({responseJSON: {}}, 500, 'Internal Server Error');
 
     var messageEvent = spyOnEvent(document, Pixelated.events.ui.userAlerts.displayMessage);
-    spyOn($, 'ajax').andReturn(deferred);
+    spyOn($, 'ajax').and.returnValue(deferred);
 
     this.component.trigger(Pixelated.events.mail.send, mail);
 
@@ -68,7 +68,7 @@ describeComponent('mail_view/data/mail_sender', function () {
     deferred.reject({responseJSON: {message: 'test: error message'}}, 422, 'Unprocessable Entity');
 
     var messageEvent = spyOnEvent(document, Pixelated.events.ui.userAlerts.displayMessage);
-    spyOn($, 'ajax').andReturn(deferred);
+    spyOn($, 'ajax').and.returnValue(deferred);
 
     this.component.trigger(Pixelated.events.mail.send, mail);
 
-- 
cgit v1.2.3