Don't fire afterSave hooks when saving with no changes.

dxg · dxg · commit 9eba427a7216 · 2014-03-13T19:28:29.000+11:00
Closes dresende#457
diff --git a/lib/Instance.js b/lib/Instance.js
@@ -222,11 +222,15 @@ function Instance(Model, opts) {
 						finish();
 					}, false);
 				} else {
-					saveAssociations(function (err) {
-						runAfterSaveActions(function () {
-							if (err) return cb(err);
+					saveAssociations(function (err, assocSaved) {
+						if (saved || assocSaved) {
+							runAfterSaveActions(function () {
+								if (err) return cb(err);
+								finish();
+							}, false, err);
+						} else {
 							finish();
-						}, false, err);
+						}
 					});
 				}
 			}
@@ -261,11 +265,11 @@ function Instance(Model, opts) {
 					if (errored) return;
 
 					errored = true;
-					return cb(err);
+					return cb(err, true);
 				}
 
 				if (--pending === 0) {
-					return cb();
+					return cb(null, true);
 				}
 			});
 		};
@@ -317,7 +321,7 @@ function Instance(Model, opts) {
 		}
 
 		if (--pending === 0) {
-			return cb();
+			return cb(null, false);
 		}
 	};
 	var saveInstanceExtra = function (cb) {
diff --git a/test/integration/hook.js b/test/integration/hook.js
@@ -356,13 +356,30 @@ describe("Hook", function() {
 	describe("afterSave", function () {
 		beforeEach(setup());
 
-		it("should trigger after saving an instance", function (done) {
-			Person.create([{ name: "John Doe" }], function () {
+		it("should trigger after creating an instance", function (done) {
+			Person.create({ name: "John Doe" }, function (err, john) {
+				should.not.exist(err);
+
 				triggeredHooks.afterSave.should.be.a("number");
 				triggeredHooks.beforeSave.should.be.a("number");
 				triggeredHooks.afterSave.should.not.be.below(triggeredHooks.beforeSave);
+				done();
+			});
+		});
 
-				return done();
+		it("should trigger after saving an instance", function (done) {
+			Person.create({ name: "John Doe" }, function (err, john) {
+				should.not.exist(err);
+
+				john.name = "John Doe 2";
+
+				triggeredHooks = {};
+				john.save(function (err) {
+					triggeredHooks.afterSave.should.be.a("number");
+					triggeredHooks.beforeSave.should.be.a("number");
+					triggeredHooks.afterSave.should.not.be.below(triggeredHooks.beforeSave);
+					done();
+				});
 			});
 		});
 
