From adccb2869cef002b7623f88b4496501f4b9df2e5 Mon Sep 17 00:00:00 2001
From: wangmengyan95 <wangmengyan95@gmail.com>
Date: Tue, 2 Feb 2016 16:38:56 -0800
Subject: [PATCH 1/3] Add istanbul for code coverage

---
 package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 62c6aec7..ccd957dc 100644
--- a/package.json
+++ b/package.json
@@ -22,10 +22,11 @@
     "request": "^2.65.0"
   },
   "devDependencies": {
+    "istanbul": "^0.4.2",
     "jasmine": "^2.3.2"
   },
   "scripts": {
-    "test": "TESTING=1 ./node_modules/.bin/jasmine"
+    "test": "TESTING=1 ./node_modules/.bin/istanbul cover --include-all-sources ./node_modules/.bin/jasmine"
   },
   "engines": {
     "node": ">=4.1"

From 3e46efc2e3ac8a34ae95d14322a604a58291649b Mon Sep 17 00:00:00 2001
From: Nikita Lutsenko <nlutsenko@me.com>
Date: Tue, 2 Feb 2016 17:27:53 -0800
Subject: [PATCH 2/3] Add .idea folder to ignore list.

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index 8a15aa30..2d9748d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,6 @@ node_modules
 
 # Emacs
 *~
+
+# WebStorm/IntelliJ
+.idea
\ No newline at end of file

From c430ee94da6020d2b32ffa2bea913da9de1dfb91 Mon Sep 17 00:00:00 2001
From: Fosco Marotto <gfosco@gmail.com>
Date: Tue, 2 Feb 2016 18:08:25 -0800
Subject: [PATCH 3/3] Updated test Parse.User testing user.isCurrent, and
 raised testing time limit.

---
 spec/ParseUser.spec.js | 77 ++++++++++++++++++------------------------
 spec/helper.js         |  2 +-
 2 files changed, 34 insertions(+), 45 deletions(-)

diff --git a/spec/ParseUser.spec.js b/spec/ParseUser.spec.js
index 458b43ee..5f7c4fd4 100644
--- a/spec/ParseUser.spec.js
+++ b/spec/ParseUser.spec.js
@@ -268,50 +268,39 @@ describe('Parse.User testing', () => {
     user2.set("password", "password");
     user3.set("password", "password");
 
-    user1.signUp(null, {
-      success: function () {
-        equal(user1.isCurrent(), true);
-        equal(user2.isCurrent(), false);
-        equal(user3.isCurrent(), false);
-        user2.signUp(null, {
-          success: function() {
-            equal(user1.isCurrent(), false);
-            equal(user2.isCurrent(), true);
-            equal(user3.isCurrent(), false);
-            user3.signUp(null, {
-              success: function() {
-                equal(user1.isCurrent(), false);
-                equal(user2.isCurrent(), false);
-                equal(user3.isCurrent(), true);
-                Parse.User.logIn("a", "password", {
-                  success: function(user1) {
-                    equal(user1.isCurrent(), true);
-                    equal(user2.isCurrent(), false);
-                    equal(user3.isCurrent(), false);
-                    Parse.User.logIn("b", "password", {
-                      success: function(user2) {
-                        equal(user1.isCurrent(), false);
-                        equal(user2.isCurrent(), true);
-                        equal(user3.isCurrent(), false);
-                        Parse.User.logIn("b", "password", {
-                          success: function(user3) {
-                            equal(user1.isCurrent(), false);
-                            equal(user2.isCurrent(), true);
-                            equal(user3.isCurrent(), true);
-                            Parse.User.logOut();
-                            equal(user3.isCurrent(), false);
-                            done();
-                          }
-                        });
-                      }
-                    });
-                  }
-                });
-              }
-            });
-          }
-        });
-      }
+    user1.signUp().then(() => {
+      equal(user1.isCurrent(), true);
+      equal(user2.isCurrent(), false);
+      equal(user3.isCurrent(), false);
+      return user2.signUp();
+    }).then(() => {
+      equal(user1.isCurrent(), false);
+      equal(user2.isCurrent(), true);
+      equal(user3.isCurrent(), false);
+      return user3.signUp();
+    }).then(() => {
+      equal(user1.isCurrent(), false);
+      equal(user2.isCurrent(), false);
+      equal(user3.isCurrent(), true);
+      return Parse.User.logIn("a", "password");
+    }).then(() => {
+      equal(user1.isCurrent(), true);
+      equal(user2.isCurrent(), false);
+      equal(user3.isCurrent(), false);
+      return Parse.User.logIn("b", "password");
+    }).then(() => {
+      equal(user1.isCurrent(), false);
+      equal(user2.isCurrent(), true);
+      equal(user3.isCurrent(), false);
+      return Parse.User.logIn("b", "password");
+    }).then(() => {
+      equal(user1.isCurrent(), false);
+      equal(user2.isCurrent(), true);
+      equal(user3.isCurrent(), false);
+      return Parse.User.logOut();
+    }).then(() => {
+      equal(user2.isCurrent(), false);
+      done();
     });
   });
 
diff --git a/spec/helper.js b/spec/helper.js
index 761796a6..ef80e077 100644
--- a/spec/helper.js
+++ b/spec/helper.js
@@ -1,6 +1,6 @@
 // Sets up a Parse API server for testing.
 
-jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000;
+jasmine.DEFAULT_TIMEOUT_INTERVAL = 2000;
 
 var cache = require('../cache');
 var DatabaseAdapter = require('../DatabaseAdapter');