Merge branch 'wolframkriesing-allow-pure-values-in-assertThat'

lib/assertThat.js

@@ -3,14 +3,16 @@
 const _ = require('lodash');
 const AssertionError = require('assertion-error');
 const Description = require('./Description');
+const asMatcher = require('./utils/asMatcher');
 
-function assertThat(reason, actual, matcher) {
-	if (arguments.length === 2) {
-		matcher = actual;
-		actual = reason;
-		reason = '';
-	}
+const processArgs = (args) => {
+	const hasThreeArgs = args.length === 3;
+	const [reason, actual, maybeMatcher] = hasThreeArgs ? args : ['', ...args];
+	return {reason, actual, matcher: asMatcher(maybeMatcher)};
+};
 
+const assertThat = (...args) => {
+	const {reason, matcher, actual} = processArgs(args);
 	const matches = matcher.matches(actual);
 
 	if (matches && _.isFunction(matches.then)) {
@@ -37,6 +39,6 @@ function assertThat(reason, actual, matcher) {
 
 		throw new AssertionError(description.get(), errorProperties, assertThat);
 	}
-}
+};
 
 module.exports = assertThat;

test/node/assertThatSpec.js

@@ -26,6 +26,22 @@ describe('assertThat', () => {
 		assert.ok(passedValue === input, 'Received: ' + passedValue);
 	});
 
+	it('should wrap non-matcher values in `equalTo()` (without message)', () => {
+
+		assert.doesNotThrow(() => __.assertThat(true, true));
+		assert.doesNotThrow(() => __.assertThat('some string', 'some string'));
+		assert.doesNotThrow(() => __.assertThat({a: 'value'}, {a: 'value'}));
+		__.assertThat(() => __.assertThat('some value', 'other value'), __.throws(__.instanceOf(AssertionError)));
+	});
+
+	it('should wrap non-matcher values in `equalTo()` (with a message)', () => {
+
+		assert.doesNotThrow(() => __.assertThat('Boolean', true, true));
+		assert.doesNotThrow(() => __.assertThat('String', 'some string', 'some string'));
+		assert.doesNotThrow(() => __.assertThat('Objects', {a: 'value'}, {a: 'value'}));
+		__.assertThat(() => __.assertThat('Mismatching strings', 'some value', 'other value'), __.throws(__.instanceOf(AssertionError)));
+	});
+
 	it('should format assertion message if matcher fails', () => {
 		let thrown;