Merge branch 'fix/willBe_description'

rluba · Jan 20, 2015 · 53a1915 · 53a1915
2 parents ddd30a8 + c700a96
commit 53a1915
Show file tree

Hide file tree

Showing 6 changed files with 74 additions and 8 deletions.
diff --git a/dist/hamjest-deps.js b/dist/hamjest-deps.js
@@ -1133,13 +1133,13 @@ function IsFulfilled(valueOrMatcher) {
 						.append('was not fulfilled (')
 						.appendValue(qPromise.inspect())
 						.append(')');
+					deferred.resolve();
 				}
 				else {
 					description
 						.append('fulfillment value: ');
-					valueMatcher.describeMismatch(qPromise.inspect().value, description);
+					deferred.resolve(valueMatcher.describeMismatch(qPromise.inspect().value, description));
 				}
-				deferred.resolve();
 			});
 			return deferred.promise;
 		}

diff --git a/dist/hamjest-deps.min.js b/dist/hamjest-deps.min.js
diff --git a/dist/hamjest.js b/dist/hamjest.js
@@ -1133,13 +1133,13 @@ function IsFulfilled(valueOrMatcher) {
 						.append('was not fulfilled (')
 						.appendValue(qPromise.inspect())
 						.append(')');
+					deferred.resolve();
 				}
 				else {
 					description
 						.append('fulfillment value: ');
-					valueMatcher.describeMismatch(qPromise.inspect().value, description);
+					deferred.resolve(valueMatcher.describeMismatch(qPromise.inspect().value, description));
 				}
-				deferred.resolve();
 			});
 			return deferred.promise;
 		}

diff --git a/dist/hamjest.min.js b/dist/hamjest.min.js
diff --git a/lib/matchers/IsFulfilled.js b/lib/matchers/IsFulfilled.js
@@ -37,13 +37,13 @@ function IsFulfilled(valueOrMatcher) {
 						.append('was not fulfilled (')
 						.appendValue(qPromise.inspect())
 						.append(')');
+					deferred.resolve();
 				}
 				else {
 					description
 						.append('fulfillment value: ');
-					valueMatcher.describeMismatch(qPromise.inspect().value, description);
+					deferred.resolve(valueMatcher.describeMismatch(qPromise.inspect().value, description));
 				}
-				deferred.resolve();
 			});
 			return deferred.promise;
 		}

diff --git a/test/matchers/IsFulfilledSpec.js b/test/matchers/IsFulfilledSpec.js
@@ -242,5 +242,71 @@ describe('IsFulfilled', function () {
 				});
 			});
 		});
+
+		describe('with a promising matcher', function () {
+			var sut;
+			beforeEach(function () {
+				sut = fulfilled(__.contains(__.willBe('expected')));
+			});
+
+			it('should match fulfilled promise with matching values', function (done) {
+				var aFulfilledPromise = q([
+					q('expected')
+				]);
+
+				sut.matches(aFulfilledPromise).done(function (value) {
+					assertTrue(value);
+					done();
+				});
+			});
+
+			it('should not match fulfilled promise with nonmatching value', function (done) {
+				var aFulfilledPromise = q([
+					q('another value')
+				]);
+
+				sut.matches(aFulfilledPromise).done(function (value) {
+					assertFalse(value);
+					done();
+				});
+			});
+
+			it('should wait for pending promises', function (done) {
+				var deferred = q.defer();
+				var aFulfilledPromiseContainingAPendingPromise = q([deferred.promise]);
+
+				sut.matches(aFulfilledPromiseContainingAPendingPromise).done(function (value) {
+					assertTrue(value);
+					done();
+				});
+
+				deferred.resolve('expected');
+			});
+
+			describe('description', function () {
+				var description;
+
+				beforeEach(function () {
+					description = new Description();
+				});
+
+				it('should contain matcher description', function () {
+
+					sut.describeTo(description);
+
+					__.assertThat(description.get(), __.equalTo('a promise fulfilled with [a promise fulfilled with "expected"]'));
+				});
+
+				it('should contain mismatch description', function (done) {
+
+					var actual = q([q('another value')]);
+
+					sut.describeMismatch(actual, description).done(function () {
+						__.assertThat(description.get(), __.equalTo('fulfillment value: item 0: fulfillment value: was "another value"\n'));
+						done();
+					});
+				});
+			});
+		});
 	});
 });