Merge branch 'master' of github.com:ParsePlatform/Parse-SDK-JS into release-1.8.0

Conflicts:
	src/__tests__/ParseUser-test.js

Author: andrewimm

package.json

@@ -1,6 +1,6 @@
 {
   "name": "parse",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "description": "The Parse JavaScript SDK",
   "homepage": "https://www.parse.com",
   "keywords": [

src/CoreManager.js

@@ -113,7 +113,8 @@ var config: { [key: string]: mixed } = {
   // Defaults
   IS_NODE: (typeof process !== 'undefined' &&
             !!process.versions &&
-            !!process.versions.node),
+            !!process.versions.node &&
+            !process.version.electron),
   REQUEST_ATTEMPT_LIMIT: 5,
   SERVER_URL: 'https://api.parse.com/1',
   VERSION: 'js' + require('../package.json').version,

src/Parse.js

@@ -25,7 +25,7 @@ var Parse = {
    * You can get your keys from the Data Browser on parse.com.
    * @method initialize
    * @param {String} applicationId Your Parse Application ID.
-   * @param {String} javaScriptKey Your Parse JavaScript Key.
+   * @param {String} javaScriptKey (optional) Your Parse JavaScript Key (Not needed for parse-server)
    * @param {String} masterKey (optional) Your Parse Master Key. (Node.js only!)
    * @static
    */

src/RESTController.js

@@ -163,7 +163,10 @@ const RESTController = {
     }
 
     payload._ApplicationId = CoreManager.get('APPLICATION_ID');
-    payload._JavaScriptKey = CoreManager.get('JAVASCRIPT_KEY');
+    let jsKey = CoreManager.get('JAVASCRIPT_KEY');
+    if (jsKey) {
+      payload._JavaScriptKey = jsKey;
+    }
     payload._ClientVersion = CoreManager.get('VERSION');
 
     var useMasterKey = options.useMasterKey;

src/__tests__/CoreManager-test.js

@@ -20,6 +20,10 @@ describe('CoreManager', () => {
     expect(CoreManager.get('VERSION').length).toBeGreaterThan(0);
   });
 
+  it('detects when running in node', () => {
+    expect(CoreManager.get('IS_NODE')).toBe(true);
+  });
+
   it('can set and retrieve arbitrary values', () => {
     expect(CoreManager.get.bind(null, 'something')).toThrow(
       'Configuration key not found: something'

src/__tests__/ParseUser-test.js

@@ -522,6 +522,39 @@ describe('ParseUser', () => {
     });
   }));
 
+  it('clears the current user on disk when logged out', asyncHelper((done) => {
+    ParseUser.enableUnsafeCurrentUser();
+    ParseUser._clearCache();
+    Storage._clear();
+    CoreManager.setRESTController({
+      request() {
+        return ParsePromise.as({
+          objectId: 'uid5',
+        }, 201);
+      },
+      ajax() {}
+    });
+
+    var path = Storage.generatePath('currentUser');
+    ParseUser.signUp('temporary', 'password').then((u) => {
+      expect(u.isCurrent()).toBe(true);
+      expect(Storage.getItem(path)).not.toBe(null);
+      ParseUser._clearCache();
+      CoreManager.setRESTController({
+        request() {
+          return ParsePromise.as({}, 200);
+        },
+        ajax() {}
+      });
+      return ParseUser.logOut();
+    }).then(() => {
+      ParseUser._clearCache();
+      expect(ParseUser.current()).toBe(null);
+      expect(Storage.getItem(path)).toBe(null);
+      done();
+    });
+  }));
+
   it('can get error when recursive _linkWith call fails', asyncHelper((done) => {
     CoreManager.setRESTController({
       request(method, path, body, options) {