Return-Path: X-Original-To: apmail-cordova-commits-archive@www.apache.org Delivered-To: apmail-cordova-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3909518869 for ; Wed, 4 Nov 2015 06:17:49 +0000 (UTC) Received: (qmail 8328 invoked by uid 500); 4 Nov 2015 06:17:49 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 8257 invoked by uid 500); 4 Nov 2015 06:17:49 -0000 Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list commits@cordova.apache.org Received: (qmail 8241 invoked by uid 99); 4 Nov 2015 06:17:49 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Nov 2015 06:17:49 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id F40DFE08E2; Wed, 4 Nov 2015 06:17:48 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: purplecabbage@apache.org To: commits@cordova.apache.org Date: Wed, 04 Nov 2015 06:17:49 -0000 Message-Id: <25d74f245fc44553a403d16abf1f35b9@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] cordova-plugin-file-transfer git commit: Merge branch 'CB-9906' Merge branch 'CB-9906' Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/commit/066acb33 Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/tree/066acb33 Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/diff/066acb33 Branch: refs/heads/master Commit: 066acb33aff08e97f6bbb1bd1b9141e9e8238cd1 Parents: 4dc697a c5d9272 Author: Jesse MacFadyen Authored: Tue Nov 3 22:17:28 2015 -0800 Committer: Jesse MacFadyen Committed: Tue Nov 3 22:17:28 2015 -0800 ---------------------------------------------------------------------- tests/tests.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/blob/066acb33/tests/tests.js ---------------------------------------------------------------------- diff --cc tests/tests.js index fd6f09e,4ce4f95..dd3883e --- a/tests/tests.js +++ b/tests/tests.js @@@ -177,10 -175,8 +177,10 @@@ exports.defineAutoTests = function () // In IE, when lengthComputable === false, event.total somehow is equal to 2^64 if (isIE) { expect(event.total).toBe(Math.pow(2, 64)); + } else if (isIOS) { + expect(event.total).toBe(-1); } else { - expect(event.total).toBe(0); + expect(event.total).toBeLessThan(1); } } }; --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org For additional commands, e-mail: commits-help@cordova.apache.org