From 5a72e676ae63a41fb990ed1b258d9139cdb5ef4a Mon Sep 17 00:00:00 2001
From: Thomas Steur <thomas.steur@gmail.com>
Date: Thu, 30 Jul 2015 16:05:37 +0200
Subject: [PATCH] fix angular tests
---
.../CoreHome/angularjs/common/services/piwik-api.js | 6 +++---
.../angularjs/common/services/piwik-api.spec.js | 12 +++---------
2 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/plugins/CoreHome/angularjs/common/services/piwik-api.js b/plugins/CoreHome/angularjs/common/services/piwik-api.js
index d381497bd0..eaf2225815 100644
--- a/plugins/CoreHome/angularjs/common/services/piwik-api.js
+++ b/plugins/CoreHome/angularjs/common/services/piwik-api.js
@@ -76,7 +76,7 @@
{
response = response.data;
- if (!angular.isDefined(response) || response.data === null) {
+ if (!angular.isDefined(response) || response === null) {
return $q.reject(null);
} else if (isErrorResponse(response)) {
@@ -92,8 +92,8 @@
function onError(response)
{
var message = 'Something went wrong';
- if (response && response.status === 0) {
- message = 'Request was most likely aborted';
+ if (response && (response.status === 0 || response.status === -1)) {
+ message = 'Request was possibly aborted';
}
return $q.reject(message);
diff --git a/plugins/CoreHome/angularjs/common/services/piwik-api.spec.js b/plugins/CoreHome/angularjs/common/services/piwik-api.spec.js
index 9f72af9499..1faf387ea3 100644
--- a/plugins/CoreHome/angularjs/common/services/piwik-api.spec.js
+++ b/plugins/CoreHome/angularjs/common/services/piwik-api.spec.js
@@ -86,13 +86,13 @@
$httpBackend.flush();
});
- it("should not fail when multiple aborts are issued", function (done) {
+ it("should fail when multiple aborts are issued", function (done) {
var request = piwikApi.fetch({
method: "SomePlugin.action"
}).then(function (response) {
- done(new Error("Aborted request succeeded!"));
+ done(new Error("Aborted request succeeded but should fail!"));
}).catch(function (ex) {
- done(ex);
+ done();
});
request.abort();
@@ -153,8 +153,6 @@
}).then(function (response) {
done(new Error("Aborted request finished!"));
}).catch(function (ex) {
- done(ex);
- }).finally(function () {
request1Done = true;
finishIfBothDone();
});
@@ -190,8 +188,6 @@
}).then(function (response) {
done(new Error("Aborted request finished (request 1)!"));
}).catch(function (ex) {
- done(ex);
- }).finally(function () {
request1Done = true;
finishIfBothDone();
});
@@ -201,8 +197,6 @@
}).then(function (response) {
done(new Error("Aborted request finished (request 2)!"));
}).catch(function (ex) {
- done(ex);
- }).finally(function () {
request2Done = true;
finishIfBothDone();
});
--
GitLab