Repository: usergrid Updated Branches: refs/heads/master af7d2e4fd -> 82dcfbaaa
Revert "Temporarily disable two notification tests that are failing with current test infrastructure" This reverts commit af7d2e4fda14b8e9640cbe74c4d9052f6eaab820. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/82dcfbaa Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/82dcfbaa Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/82dcfbaa Branch: refs/heads/master Commit: 82dcfbaaacfd5bfc226fc1f6123c6d0843c74b89 Parents: af7d2e4 Author: Michael Russo <[email protected]> Authored: Fri Feb 26 10:02:11 2016 -0800 Committer: Michael Russo <[email protected]> Committed: Fri Feb 26 10:02:11 2016 -0800 ---------------------------------------------------------------------- .../test/notifications/notifications.js | 90 ++++++++++---------- 1 file changed, 44 insertions(+), 46 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/82dcfbaa/tests/integration/test/notifications/notifications.js ---------------------------------------------------------------------- diff --git a/tests/integration/test/notifications/notifications.js b/tests/integration/test/notifications/notifications.js index 5b2b579..07e7642 100644 --- a/tests/integration/test/notifications/notifications.js +++ b/tests/integration/test/notifications/notifications.js @@ -239,52 +239,50 @@ module.exports = { // SEND NOTIFICATIONS HERE AND VALIDATE THE NUMBER OF NOTIFICATIONS SENT ARE ACCURATE FOR QUERY - // temporarily disable these tests until test infrastructure is upgraded - - //describe("notification -> user - direct path", function () { - // it("should send a single notification to a user", function (done) { - // this.timeout(5000) - // this.slow(5000); - // setTimeout(function () { - // - // notifications.send("users/" + usersArray[1].username, gcmNotification, - // function (err, notification) { - // should(err).be.null; - // notification.should.not.be.null; - // notification.expectedCount.should.be.equal(1); - // done(); - // - // }); - // - // }, 1000) - // - // - // }) - // - //}); - - //describe("notification -> user - via matrix query", function () { - // it("should send a single notification to a user", function (done) { - // this.timeout(5000) - // this.slow(5000); - // - // setTimeout(function () { - // - // notifications.send("users;ql=select * where username = 'notificationuser-0'", gcmNotification, - // function (err, notification) { - // should(err).be.null; - // notification.should.not.be.null; - // notification.expectedCount.should.be.equal(1); - // done(); - // - // }); - // - // }, 1000); - // - // - // }) - // - //}); + describe("notification -> user - direct path", function () { + it("should send a single notification to a user", function (done) { + this.timeout(5000) + this.slow(5000); + setTimeout(function () { + + notifications.send("users/" + usersArray[1].username, gcmNotification, + function (err, notification) { + should(err).be.null; + notification.should.not.be.null; + notification.expectedCount.should.be.equal(1); + done(); + + }); + + }, 1000) + + + }) + + }); + + describe("notification -> user - via matrix query", function () { + it("should send a single notification to a user", function (done) { + this.timeout(5000) + this.slow(5000); + + setTimeout(function () { + + notifications.send("users;ql=select * where username = 'notificationuser-0'", gcmNotification, + function (err, notification) { + should(err).be.null; + notification.should.not.be.null; + notification.expectedCount.should.be.equal(1); + done(); + + }); + + }, 1000); + + + }) + + }); describe("notification -> groups - via matrix query", function () { it("should send a single notification to groups with the same users", function (done) {
