hamjest 3.7.3 → 4.0.1

package/lib/matchers/IsArrayWithItem.js

@@ -1,18 +1,21 @@
 'use strict';
 
-const _ = require('lodash');
+const _create = require('lodash/create');
+const _map = require('lodash/map');
+const _some = require('lodash/some');
 const IsArray = require('./IsArray');
-const acceptingMatcher = require('../utils/acceptingMatcher');
 const promiseAgnostic = require('./promiseAgnostic');
+const asMatcher = require('../utils/asMatcher');
 
-const IsArrayWithItem = acceptingMatcher((matcher) => {
-	return _.create(new IsArray(), {
+function IsArrayWithItem(valueOrMatcher) {
+	const matcher = asMatcher(valueOrMatcher);
+	return _create(new IsArray(), {
 		matchesSafely: function (actual) {
-			const results = _.map(actual, (value) => {
+			const results = _map(actual, (value) => {
 				return matcher.matches(value);
 			});
 
-			return promiseAgnostic.matchesAggregate(results, _.some);
+			return promiseAgnostic.matchesAggregate(results, _some);
 		},
 		describeTo: function (description) {
 			description
@@ -24,7 +27,7 @@ const IsArrayWithItem = acceptingMatcher((matcher) => {
 				description.append('was empty');
 				return;
 			}
-			const results = _.map(actual, (value) => {
+			const results = _map(actual, (value) => {
 				return matcher.matches(value);
 			});
 
@@ -38,7 +41,7 @@ const IsArrayWithItem = acceptingMatcher((matcher) => {
 			});
 		}
 	});
-});
+}
 
 IsArrayWithItem.hasItem = function (valueOrMatcher) {
 	return new IsArrayWithItem(valueOrMatcher);

package/lib/matchers/IsArrayWithItems.js

@@ -1,14 +1,16 @@
 'use strict';
 
-const _ = require('lodash');
+const _create = require('lodash/create');
+const _forEach = require('lodash/forEach');
+const _map = require('lodash/map');
 const IsArray = require('./IsArray');
 const hasItem = require('./IsArrayWithItem').hasItem;
 const AllOf = require('./AllOf');
 const asMatcher = require('../utils/asMatcher');
 
 const IsArrayWithItems = function IsArrayWithItems(items) {
-	const innerMatcher = new AllOf(_.map(items, hasItem));
-	return _.create(new IsArray(), {
+	const innerMatcher = new AllOf(_map(items, hasItem));
+	return _create(new IsArray(), {
 		matchesSafely: function (actual) {
 			return innerMatcher.matches(actual);
 		},
@@ -16,7 +18,7 @@ const IsArrayWithItems = function IsArrayWithItems(items) {
 			description
 				.append('an array containing ');
 			let first = true;
-			_.forEach(items, (item) => {
+			_forEach(items, (item) => {
 				if (!first) {
 					description.append(', ');
 				}

package/lib/matchers/IsBoolean.js

@@ -1,12 +1,13 @@
 'use strict';
 
-const _ = require('lodash');
+const _create = require('lodash/create');
+const _isBoolean = require('lodash/isBoolean');
 const TypeSafeMatcher = require('./TypeSafeMatcher');
 
 function IsBoolean() {
-	return _.create(new TypeSafeMatcher(), {
+	return _create(new TypeSafeMatcher(), {
 		isExpectedType: function (actual) {
-			return _.isBoolean(actual);
+			return _isBoolean(actual);
 		},
 		describeTo: function (description) {
 			description

package/lib/matchers/IsCloseTo.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const _ = require('lodash');
+const _create = require('lodash/create');
 const IsNumber = require('./IsNumber');
 const assertThat = require('../assertThat');
 const is = require('./Is').is;
@@ -14,7 +14,7 @@ function IsCloseTo(threshold, delta) {
 		return Math.abs(actual - threshold);
 	}
 
-	return _.create(new IsNumber(), {
+	return _create(new IsNumber(), {
 		matchesSafely: function (actual) {
 			return getDelta(actual) <= delta;
 		},

package/lib/matchers/IsDate.js

@@ -1,12 +1,13 @@
 'use strict';
 
-const _ = require('lodash');
+const _create = require('lodash/create');
+const _isDate = require('lodash/isDate');
 const TypeSafeMatcher = require('./TypeSafeMatcher');
 
 function IsDate() {
-	return _.create(new TypeSafeMatcher(), {
+	return _create(new TypeSafeMatcher(), {
 		isExpectedType: function (actual) {
-			return _.isDate(actual);
+			return _isDate(actual);
 		},
 		describeTo: function (description) {
 			description

package/lib/matchers/IsDefined.js

@@ -1,13 +1,14 @@
 'use strict';
 
-const _ = require('lodash');
+const _create = require('lodash/create');
+const _isUndefined = require('lodash/isUndefined');
 const Matcher = require('./Matcher');
 const not = require('./IsNot').not;
 
 function IsDefined() {
-	return _.create(new Matcher(), {
+	return _create(new Matcher(), {
 		matches: function (actual) {
-			return !_.isUndefined(actual);
+			return !_isUndefined(actual);
 		},
 		describeTo: function (description) {
 			description.append('defined');

package/lib/matchers/IsEqual.js

@@ -1,12 +1,13 @@
 'use strict';
 
-const _ = require('lodash');
+const _create = require('lodash/create');
+const _isEqual = require('lodash/isEqual');
 const Matcher = require('./Matcher');
 
 function IsEqual(expectedValue) {
-	return _.create(new Matcher(), {
+	return _create(new Matcher(), {
 		matches: function (actualValue) {
-			return _.isEqual(expectedValue, actualValue);
+			return _isEqual(expectedValue, actualValue);
 		},
 		describeTo: function (description) {
 			description.appendValue(expectedValue);

package/lib/matchers/IsFulfilled.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const _ = require('lodash');
+const _create = require('lodash/create');
 const IsPromise = require('./IsPromise');
 const asMatcher = require('../utils/asMatcher');
 const anything = require('./IsAnything').anything;
@@ -8,7 +8,7 @@ const anything = require('./IsAnything').anything;
 function IsFulfilled(valueOrMatcher) {
 	const anyValue = (arguments.length === 0);
 	const valueMatcher = (anyValue ? anything() : asMatcher(valueOrMatcher));
-	return _.create(new IsPromise(), {
+	return _create(new IsPromise(), {
 		matchesSafely: function (actual) {
 			return actual.then((value) => {
 				return valueMatcher.matches(value);

package/lib/matchers/IsFunction.js

@@ -1,12 +1,13 @@
 'use strict';
 
-const _ = require('lodash');
+const _create = require('lodash/create');
+const _isFunction = require('lodash/isFunction');
 const TypeSafeMatcher = require('./TypeSafeMatcher');
 
 function IsFunction() {
-	return _.create(new TypeSafeMatcher(), {
+	return _create(new TypeSafeMatcher(), {
 		isExpectedType: function (actual) {
-			return _.isFunction(actual);
+			return _isFunction(actual);
 		},
 		describeTo: function (description) {
 			description

package/lib/matchers/IsFunctionThrowing.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const _ = require('lodash');
+const _create = require('lodash/create');
 const IsFunction = require('./IsFunction');
 const asMatcher = require('../utils/asMatcher');
 const anything = require('./IsAnything').anything;
@@ -8,7 +8,7 @@ const anything = require('./IsAnything').anything;
 function IsFunctionThrowing(valueOrMatcher) {
 	const anyValue = (arguments.length === 0);
 	const exceptionMatcher = (anyValue ? anything() : asMatcher(valueOrMatcher));
-	return _.create(new IsFunction(), {
+	return _create(new IsFunction(), {
 		matchesSafely: function (throwingFunction) {
 			try {
 				throwingFunction();

package/lib/matchers/IsInstanceOf.js

@@ -1,6 +1,7 @@
 'use strict';
 
-const _ = require('lodash');
+const _create = require('lodash/create');
+const _isUndefined = require('lodash/isUndefined');
 const Matcher = require('./Matcher');
 const assertThat = require('../assertThat');
 const is = require('./Is').is;
@@ -11,7 +12,7 @@ const getTypeName = require('../utils/getTypeName');
 function IsInstanceOf(expectedType) {
 	assertThat(expectedType, is(func()));
 
-	return _.create(new Matcher(), {
+	return _create(new Matcher(), {
 		matches: function (actual) {
 			return actual instanceof expectedType;
 		},
@@ -21,7 +22,7 @@ function IsInstanceOf(expectedType) {
 				.append(getTypeName(expectedType));
 		},
 		describeMismatch: function (actual, description) {
-			if (_.isUndefined(actual)) {
+			if (_isUndefined(actual)) {
 				description
 					.append('was ')
 					.appendValue(actual);

package/lib/matchers/IsNot.js

@@ -1,12 +1,13 @@
 'use strict';
 
-const _ = require('lodash');
+const _create = require('lodash/create');
 const Matcher = require('./Matcher');
-const acceptingMatcher = require('../utils/acceptingMatcher');
 const promiseAgnostic = require('./promiseAgnostic');
+const asMatcher = require('../utils/asMatcher');
 
-const IsNot = acceptingMatcher((innerMatcher) => {
-	return _.create(new Matcher(), {
+function IsNot(valueOrMatcher) {
+	const innerMatcher = asMatcher(valueOrMatcher);
+	return _create(new Matcher(), {
 		matches: function (actual) {
 			return promiseAgnostic.matches(innerMatcher.matches(actual), (result) => {
 				return !result;
@@ -23,7 +24,7 @@ const IsNot = acceptingMatcher((innerMatcher) => {
 				.appendValue(value);
 		}
 	});
-});
+}
 
 IsNot.not = function (innerMatcher) {
 	return new IsNot(innerMatcher);

package/lib/matchers/IsNumber.js

@@ -1,12 +1,13 @@
 'use strict';
 
-const _ = require('lodash');
+const _create = require('lodash/create');
+const _isNumber = require('lodash/isNumber');
 const TypeSafeMatcher = require('./TypeSafeMatcher');
 
 function IsNumber() {
-	return _.create(new TypeSafeMatcher(), {
+	return _create(new TypeSafeMatcher(), {
 		isExpectedType: function (actual) {
-			return _.isNumber(actual);
+			return _isNumber(actual);
 		},
 		describeTo: function (description) {
 			description

package/lib/matchers/IsObject.js

@@ -1,12 +1,13 @@
 'use strict';
 
-const _ = require('lodash');
+const _create = require('lodash/create');
+const _isObject = require('lodash/isObject');
 const TypeSafeMatcher = require('./TypeSafeMatcher');
 
 function IsObject() {
-	return _.create(new TypeSafeMatcher(), {
+	return _create(new TypeSafeMatcher(), {
 		isExpectedType: function (actual) {
-			return _.isObject(actual);
+			return _isObject(actual);
 		},
 		describeTo: function (description) {
 			description

package/lib/matchers/IsObjectWithProperties.js

@@ -1,6 +1,13 @@
 'use strict';
 
-const _ = require('lodash');
+const _create = require('lodash/create');
+const _every = require('lodash/every');
+const _forEach = require('lodash/forEach');
+const _isArray = require('lodash/isArray');
+const _isUndefined = require('lodash/isUndefined');
+const _map = require('lodash/map');
+const _mapValues = require('lodash/mapValues');
+const _reduceRight = require('lodash/reduceRight');
 const contains = require('./IsArrayContaining').contains;
 const IsObject = require('./IsObject');
 const isMatcher = require('./Matcher').isMatcher;
@@ -13,28 +20,28 @@ function asDeepMatcher(value) {
 		if (value.constructor === Object || Object.getPrototypeOf(value) === null) {
 			return new IsObjectWithProperties(value, true);
 		}
-		if (_.isArray(value)) {
-			return contains(..._.map(value, v => asDeepMatcher(v)));
+		if (_isArray(value)) {
+			return contains(..._map(value, v => asDeepMatcher(v)));
 		}
 	}
 	return asMatcher(value);
 }
 
 function IsObjectWithProperties(properties, deep = false) {
-	const propertyMatchers = _.mapValues(properties, deep ? asDeepMatcher : asMatcher);
-	return _.create(new IsObject(), {
+	const propertyMatchers = _mapValues(properties, deep ? asDeepMatcher : asMatcher);
+	return _create(new IsObject(), {
 		matchesSafely: function (actual) {
-			const results = _.mapValues(propertyMatchers, (matcher, key) => {
+			const results = _mapValues(propertyMatchers, (matcher, key) => {
 				return matcher.matches(actual[key]);
 			});
 
-			return promiseAgnostic.matchesAggregate(results, _.every);
+			return promiseAgnostic.matchesAggregate(results, _every);
 		},
 		describeTo: function (description) {
 			description.append('an object with {');
 
 			let first = true;
-			_.forEach(propertyMatchers, (matcher, key) => {
+			_forEach(propertyMatchers, (matcher, key) => {
 				if (!first) {
 					description.append(', ');
 				}
@@ -49,7 +56,7 @@ function IsObjectWithProperties(properties, deep = false) {
 			description.append('}');
 		},
 		describeMismatchSafely: function (actual, description) {
-			const results = _.mapValues(propertyMatchers, (matcher, key) => {
+			const results = _mapValues(propertyMatchers, (matcher, key) => {
 				return matcher.matches(actual[key]);
 			});
 
@@ -91,10 +98,10 @@ IsObjectWithProperties.hasDeepProperties = function (properties) {
 };
 
 IsObjectWithProperties.hasProperty = function (propertyOrPath, valueOrMatcher) {
-	const propertyPath = _.isArray(propertyOrPath) ? propertyOrPath : propertyOrPath.split('.');
+	const propertyPath = _isArray(propertyOrPath) ? propertyOrPath : propertyOrPath.split('.');
 	const propertyToNestedMatcher = (matcher, prop) => new IsObjectWithProperties({[prop]: matcher});
-	const initialMatcher = _.isUndefined(valueOrMatcher) ? defined() : valueOrMatcher;
-	return _.reduceRight(propertyPath, propertyToNestedMatcher, initialMatcher);
+	const initialMatcher = _isUndefined(valueOrMatcher) ? defined() : valueOrMatcher;
+	return _reduceRight(propertyPath, propertyToNestedMatcher, initialMatcher);
 };
 
 module.exports = IsObjectWithProperties;

package/lib/matchers/IsPromise.js

@@ -1,12 +1,13 @@
 'use strict';
 
-const _ = require('lodash');
+const _create = require('lodash/create');
+const _isFunction = require('lodash/isFunction');
 const TypeSafeMatcher = require('./TypeSafeMatcher');
 
 function IsPromise() {
-	return _.create(new TypeSafeMatcher(), {
+	return _create(new TypeSafeMatcher(), {
 		isExpectedType: function (actual) {
-			return actual && _.isFunction(actual.then);
+			return actual && _isFunction(actual.then);
 		},
 		describeTo: function (description) {
 			description

package/lib/matchers/IsRegExp.js

@@ -1,20 +1,19 @@
 'use strict';
 
-const _ = require('lodash');
+const _isRegExp = require('lodash/isRegExp');
 const TypeSafeMatcher = require('./TypeSafeMatcher');
 
 class IsRegExp extends TypeSafeMatcher {
 	isExpectedType(actual) {
-		return _.isRegExp(actual);
+		return _isRegExp(actual);
 	}
 	describeTo(description) {
 		description
 			.append('a regular expression');
 	}
+	static regExp() {
+		return new IsRegExp();
+	}
 }
 
-IsRegExp.regExp = function () {
-	return new IsRegExp();
-};
-
 module.exports = IsRegExp;

package/lib/matchers/IsRejected.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const _ = require('lodash');
+const _create = require('lodash/create');
 const IsPromise = require('./IsPromise');
 const asMatcher = require('../utils/asMatcher');
 const anything = require('./IsAnything').anything;
@@ -8,7 +8,7 @@ const anything = require('./IsAnything').anything;
 function IsRejected(valueOrMatcher) {
 	const anyValue = (arguments.length === 0);
 	const valueMatcher = (anyValue ? anything() : asMatcher(valueOrMatcher));
-	return _.create(new IsPromise(), {
+	return _create(new IsPromise(), {
 		matchesSafely: function (actual) {
 			return actual.then(() => false, (reason) => {
 				return valueMatcher.matches(reason);

package/lib/matchers/IsSame.js

@@ -1,10 +1,10 @@
 'use strict';
 
-const _ = require('lodash');
+const _create = require('lodash/create');
 const Matcher = require('./Matcher');
 
 function IsSame(expectedValue) {
-	return _.create(new Matcher(), {
+	return _create(new Matcher(), {
 		matches: function (actualValue) {
 			return expectedValue === actualValue;
 		},

package/lib/matchers/IsString.js

@@ -1,12 +1,13 @@
 'use strict';
 
-const _ = require('lodash');
+const _create = require('lodash/create');
+const _isString = require('lodash/isString');
 const TypeSafeMatcher = require('./TypeSafeMatcher');
 
 function IsString() {
-	return _.create(new TypeSafeMatcher(), {
+	return _create(new TypeSafeMatcher(), {
 		isExpectedType: function (actual) {
-			return _.isString(actual);
+			return _isString(actual);
 		},
 		describeTo: function (description) {
 			description

package/lib/matchers/IsStringMatching.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const _ = require('lodash');
+const _create = require('lodash/create');
 const IsString = require('./IsString');
 const assertThat = require('../assertThat');
 const anyOf = require('./AnyOf').anyOf;
@@ -12,7 +12,7 @@ function IsStringMatching(stringOrPattern) {
 
 	const pattern = new RegExp(stringOrPattern);
 
-	return _.create(new IsString(), {
+	return _create(new IsString(), {
 		matchesSafely: function (actual) {
 			return pattern.test(actual);
 		},

package/lib/matchers/Matcher.js

@@ -1,10 +1,13 @@
 'use strict';
 
-const _ = require('lodash');
+const _extend = require('lodash/extend');
+const _isFunction = require('lodash/isFunction');
+const _isNull = require('lodash/isNull');
+const _isUndefined = require('lodash/isUndefined');
 
 class Matcher {
 	constructor(fns = {}) {
-		_.extend(this, fns);
+		_extend(this, fns);
 	}
 	matches() {
 		throw new Error('Not implemented');
@@ -16,11 +19,11 @@ class Matcher {
 		description.append('was ').appendValue(value);
 	}
 	static isMatcher(valueOrMatcher) {
-		return !_.isUndefined(valueOrMatcher) &&
-			!_.isNull(valueOrMatcher) &&
-			_.isFunction(valueOrMatcher.matches) &&
-			_.isFunction(valueOrMatcher.describeTo) &&
-			_.isFunction(valueOrMatcher.describeMismatch);
+		return !_isUndefined(valueOrMatcher) &&
+			!_isNull(valueOrMatcher) &&
+			_isFunction(valueOrMatcher.matches) &&
+			_isFunction(valueOrMatcher.describeTo) &&
+			_isFunction(valueOrMatcher.describeMismatch);
 	}
 }
 

package/lib/matchers/NumberComparisonMatcher.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const _ = require('lodash');
+const _create = require('lodash/create');
 const IsNumber = require('./IsNumber');
 const assertThat = require('../assertThat');
 const is = require('./Is').is;
@@ -9,7 +9,7 @@ const number = require('./IsNumber').number;
 function NumberComparisonMatcher(relation, threshold, matchesNumber) {
 	assertThat(threshold, is(number()));
 
-	return _.create(new IsNumber(), {
+	return _create(new IsNumber(), {
 		matchesSafely: function (actual) {
 			return matchesNumber.call(this, actual);
 		},
@@ -28,19 +28,20 @@ function NumberComparisonMatcher(relation, threshold, matchesNumber) {
 	});
 }
 
-_.extend(NumberComparisonMatcher, {
-	greaterThan: function (threshold) {
-		return new NumberComparisonMatcher('greater than', threshold, (actual) => actual > threshold);
-	},
-	greaterThanOrEqualTo: function (threshold) {
-		return new NumberComparisonMatcher('greater than or equal to', threshold, (actual) => actual >= threshold);
-	},
-	lessThan: function (threshold) {
-		return new NumberComparisonMatcher('less than', threshold, (actual) => actual < threshold);
-	},
-	lessThanOrEqualTo: function (threshold) {
-		return new NumberComparisonMatcher('less than or equal to', threshold, (actual) => actual <= threshold);
-	}
-});
+NumberComparisonMatcher.greaterThan = function (threshold) {
+	return new NumberComparisonMatcher('greater than', threshold, (actual) => actual > threshold);
+};
+
+NumberComparisonMatcher.greaterThanOrEqualTo = function (threshold) {
+	return new NumberComparisonMatcher('greater than or equal to', threshold, (actual) => actual >= threshold);
+};
+
+NumberComparisonMatcher.lessThan = function (threshold) {
+	return new NumberComparisonMatcher('less than', threshold, (actual) => actual < threshold);
+};
+
+NumberComparisonMatcher.lessThanOrEqualTo = function (threshold) {
+	return new NumberComparisonMatcher('less than or equal to', threshold, (actual) => actual <= threshold);
+};
 
 module.exports = NumberComparisonMatcher;