You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ripple.apache.org by br...@apache.org on 2013/07/06 00:27:48 UTC
[1/2] git commit: There were some failing tests.
Updated Branches:
refs/heads/next eac1bc6ea -> 8f64f68fd
There were some failing tests.
This was missed in a recent bug fix commit.
Not a red flag. Just needs a mock/spy change.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ripple/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ripple/commit/6452ff04
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ripple/tree/6452ff04
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ripple/diff/6452ff04
Branch: refs/heads/next
Commit: 6452ff040d2025032db0ac5832aaa868e99d1764
Parents: eac1bc6
Author: Brent Lintner <br...@gmail.com>
Authored: Fri Jul 5 18:21:33 2013 -0400
Committer: Brent Lintner <br...@gmail.com>
Committed: Fri Jul 5 18:21:33 2013 -0400
----------------------------------------------------------------------
test/unit/client/cordova/contacts.js | 26 ++++++++++++--------------
1 file changed, 12 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ripple/blob/6452ff04/test/unit/client/cordova/contacts.js
----------------------------------------------------------------------
diff --git a/test/unit/client/cordova/contacts.js b/test/unit/client/cordova/contacts.js
index 58ed818..5a02464 100644
--- a/test/unit/client/cordova/contacts.js
+++ b/test/unit/client/cordova/contacts.js
@@ -20,6 +20,7 @@
*/
describe("Cordova Contacts Bridge", function () {
var contacts = ripple('platform/cordova/2.0.0/bridge/contacts'),
+ emulatorBridge = ripple('emulatorBridge'),
db = ripple('db'),
contact = {
"name": { formatted: "Mark Dineen" },
@@ -48,25 +49,22 @@ describe("Cordova Contacts Bridge", function () {
}, {
"name": { formatted: "Mark McArdle" },
"displayName": "Mark McArdle",
- "emails": [{ type: "work", value: "mark@tinyhippos.com", pref: false }]
- }],
- navi;
+ "emails": [{ type: "work", value: "mark@tinyhippos.com", pref: false }]
+ }];
beforeEach(function () {
- navi = global.navigator;
s = jasmine.createSpy("success");
e = jasmine.createSpy("error");
- global.navigator = {
- contacts: {
- create: jasmine.createSpy("navigator.contacts.create").andCallFake(function (obj) {
- return obj;
- })
- }
- };
- });
- afterEach(function () {
- global.navigator = navi;
+ spyOn(emulatorBridge, 'window').andReturn({
+ navigator: {
+ contacts: {
+ create: jasmine.createSpy("navigator.contacts.create").andCallFake(function (obj) {
+ return obj;
+ })
+ }
+ }
+ });
});
describe("on search", function () {
[2/2] git commit: Small code cleanup (tabbing alignment,
odd chars at end of lines).
Posted by br...@apache.org.
Small code cleanup (tabbing alignment, odd chars at end of lines).
Project: http://git-wip-us.apache.org/repos/asf/incubator-ripple/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ripple/commit/8f64f68f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ripple/tree/8f64f68f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ripple/diff/8f64f68f
Branch: refs/heads/next
Commit: 8f64f68fd30f844ee9f5f0f9e0f09301ca3c3b98
Parents: 6452ff0
Author: Brent Lintner <br...@gmail.com>
Authored: Fri Jul 5 18:23:39 2013 -0400
Committer: Brent Lintner <br...@gmail.com>
Committed: Fri Jul 5 18:23:39 2013 -0400
----------------------------------------------------------------------
test/unit/client/cordova/contacts.js | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ripple/blob/8f64f68f/test/unit/client/cordova/contacts.js
----------------------------------------------------------------------
diff --git a/test/unit/client/cordova/contacts.js b/test/unit/client/cordova/contacts.js
index 5a02464..f5e4823 100644
--- a/test/unit/client/cordova/contacts.js
+++ b/test/unit/client/cordova/contacts.js
@@ -21,31 +21,31 @@
describe("Cordova Contacts Bridge", function () {
var contacts = ripple('platform/cordova/2.0.0/bridge/contacts'),
emulatorBridge = ripple('emulatorBridge'),
- db = ripple('db'),
- contact = {
- "name": { formatted: "Mark Dineen" },
- "id": Math.uuid(undefined, 16),
- "displayName": "Mark Dineen",
- "emails": [{ type: "work", value: "mddineen@gmail.com", pref: false }]
- },
- s,
- e,
- _default = [{
+ db = ripple('db'),
+ contact = {
+ "name": { formatted: "Mark Dineen" },
+ "id": Math.uuid(undefined, 16),
+ "displayName": "Mark Dineen",
+ "emails": [{ type: "work", value: "mddineen@gmail.com", pref: false }]
+ },
+ s,
+ e,
+ _default = [{
"name": { formatted: "Brent Lintner" },
"displayName": "Brent Lintner",
- "emails": [{ type: "work", value: "brent@tinyhippos.com", pref: false }]
+ "emails": [{ type: "work", value: "brent@tinyhippos.com", pref: false }]
}, {
"name": { formatted: "PJ Lowe" },
"displayName": "PJ Lowe",
- "emails": [{ type: "work", value: "pj@tinyhippos.com", pref: false }]
+ "emails": [{ type: "work", value: "pj@tinyhippos.com", pref: false }]
}, {
"name": { formatted: "Dan Silivestru" },
"displayName": "Dan Silivestru",
- "emails": [{ type: "work", value: "dan@tinyhippos.com", pref: false }]
+ "emails": [{ type: "work", value: "dan@tinyhippos.com", pref: false }]
}, {
"name": { formatted: "Gord Tanner" },
"displayName": "Gord Tanner",
- "emails": [{ type: "work", value: "gord@tinyhippos.com", pref: true }]
+ "emails": [{ type: "work", value: "gord@tinyhippos.com", pref: true }]
}, {
"name": { formatted: "Mark McArdle" },
"displayName": "Mark McArdle",