joe/kami-parse-server
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into facebook_login

Browse Source
This commit is contained in:
Taylor Stine
2016-02-02 21:58:01 -05:00
parent 54e8285577 3d3a97d151
commit 7ab05372ea
4 changed files with 39 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@@ -28,3 +28,6 @@ node_modules
# Emacs # Emacs
*~ *~
# WebStorm/IntelliJ
.idea

3
package.json
View File

@@ -22,10 +22,11 @@
"request": "^2.65.0" "request": "^2.65.0"
}, },
"devDependencies": { "devDependencies": {
"istanbul": "^0.4.2",
"jasmine": "^2.3.2" "jasmine": "^2.3.2"
}, },
"scripts": { "scripts": {
"test": "TESTING=1 ./node_modules/.bin/jasmine" "test": "TESTING=1 ./node_modules/.bin/istanbul cover --include-all-sources ./node_modules/.bin/jasmine"
}, },
"engines": { "engines": {
"node": ">=4.1" "node": ">=4.1"

77
spec/ParseUser.spec.js
View File

@@ -268,50 +268,39 @@ describe('Parse.User testing', () => {
user2.set("password", "password"); user2.set("password", "password");
user3.set("password", "password"); user3.set("password", "password");
user1.signUp(null, { user1.signUp().then(() => {
success: function () { equal(user1.isCurrent(), true);
equal(user1.isCurrent(), true); equal(user2.isCurrent(), false);
equal(user2.isCurrent(), false); equal(user3.isCurrent(), false);
equal(user3.isCurrent(), false); return user2.signUp();
user2.signUp(null, { }).then(() => {
success: function() { equal(user1.isCurrent(), false);
equal(user1.isCurrent(), false); equal(user2.isCurrent(), true);
equal(user2.isCurrent(), true); equal(user3.isCurrent(), false);
equal(user3.isCurrent(), false); return user3.signUp();
user3.signUp(null, { }).then(() => {
success: function() { equal(user1.isCurrent(), false);
equal(user1.isCurrent(), false); equal(user2.isCurrent(), false);
equal(user2.isCurrent(), false); equal(user3.isCurrent(), true);
equal(user3.isCurrent(), true); return Parse.User.logIn("a", "password");
Parse.User.logIn("a", "password", { }).then(() => {
success: function(user1) { equal(user1.isCurrent(), true);
equal(user1.isCurrent(), true); equal(user2.isCurrent(), false);
equal(user2.isCurrent(), false); equal(user3.isCurrent(), false);
equal(user3.isCurrent(), false); return Parse.User.logIn("b", "password");
Parse.User.logIn("b", "password", { }).then(() => {
success: function(user2) { equal(user1.isCurrent(), false);
equal(user1.isCurrent(), false); equal(user2.isCurrent(), true);
equal(user2.isCurrent(), true); equal(user3.isCurrent(), false);
equal(user3.isCurrent(), false); return Parse.User.logIn("b", "password");
Parse.User.logIn("b", "password", { }).then(() => {
success: function(user3) { equal(user1.isCurrent(), false);
equal(user1.isCurrent(), false); equal(user2.isCurrent(), true);
equal(user2.isCurrent(), true); equal(user3.isCurrent(), false);
equal(user3.isCurrent(), true); return Parse.User.logOut();
Parse.User.logOut(); }).then(() => {
equal(user3.isCurrent(), false); equal(user2.isCurrent(), false);
done(); done();
}
});
}
});
}
});
}
});
}
});
}
}); });
}); });

2
spec/helper.js
View File

@@ -1,6 +1,6 @@
// Sets up a Parse API server for testing. // Sets up a Parse API server for testing.
jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000; jasmine.DEFAULT_TIMEOUT_INTERVAL = 2000;
var cache = require('../cache'); var cache = require('../cache');
var DatabaseAdapter = require('../DatabaseAdapter'); var DatabaseAdapter = require('../DatabaseAdapter');