Skip to content
This repository has been archived by the owner on Nov 4, 2020. It is now read-only.

Commit

Permalink
Update years
Browse files Browse the repository at this point in the history
  • Loading branch information
btd committed Aug 28, 2017
1 parent 670df30 commit 6114e76
Show file tree
Hide file tree
Showing 19 changed files with 46 additions and 51 deletions.
2 changes: 1 addition & 1 deletion LICENSE
@@ -1,5 +1,5 @@
Copyright(c) 2010-2013 TJ Holowaychuk <tj@vision-media.ca>
Copyright(c) 2013-2016 Denis Bardadym <bardadymchik@gmail.com>
Copyright(c) 2013-2017 Denis Bardadym <bardadymchik@gmail.com>

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion lib/assertion-error.js
@@ -1,7 +1,7 @@
/*
* should.js - assertion library
* Copyright(c) 2010-2013 TJ Holowaychuk <tj@vision-media.ca>
* Copyright(c) 2013-2016 Denis Bardadym <bardadymchik@gmail.com>
* Copyright(c) 2013-2017 Denis Bardadym <bardadymchik@gmail.com>
* MIT Licensed
*/
import { merge } from 'should-util';
Expand Down
29 changes: 12 additions & 17 deletions lib/assertion.js
@@ -1,20 +1,19 @@
/*
* should.js - assertion library
* Copyright(c) 2010-2013 TJ Holowaychuk <tj@vision-media.ca>
* Copyright(c) 2013-2016 Denis Bardadym <bardadymchik@gmail.com>
* Copyright(c) 2013-2017 Denis Bardadym <bardadymchik@gmail.com>
* MIT Licensed
*/

import AssertionError from './assertion-error';
import { merge } from 'should-util';

import AssertionError from "./assertion-error";
import { merge } from "should-util";

// a bit hacky way how to get error to do not have stack
function LightAssertionError(options) {
merge(this, options);

if (!options.message) {
Object.defineProperty(this, 'message', {
Object.defineProperty(this, "message", {
get: function() {
if (!this._message) {
this._message = this.generateMessage();
Expand All @@ -30,7 +29,6 @@ LightAssertionError.prototype = {
generateMessage: AssertionError.prototype.generateMessage
};


/**
* should Assertion
* @param {*} obj Given object for assertion
Expand All @@ -44,7 +42,7 @@ export function Assertion(obj) {
this.anyOne = false;
this.negate = false;

this.params = {actual: obj};
this.params = { actual: obj };
}

Assertion.prototype = {
Expand Down Expand Up @@ -82,9 +80,9 @@ Assertion.prototype = {

var params = this.params;

if ('obj' in params && !('actual' in params)) {
if ("obj" in params && !("actual" in params)) {
params.actual = params.obj;
} else if (!('obj' in params) && !('actual' in params)) {
} else if (!("obj" in params) && !("actual" in params)) {
params.actual = this.obj;
}

Expand Down Expand Up @@ -121,8 +119,6 @@ Assertion.prototype = {
}
};



/**
* Assertion used to delegate calls of Assertion methods inside of Promise.
* It has almost all methods of Assertion.prototype
Expand Down Expand Up @@ -203,7 +199,7 @@ Assertion.add = function(name, func) {
// negative pass
if (this.negate) {
context.negate = true; // because .fail will set negate
context.params.details = 'false negative fail';
context.params.details = "false negative fail";
// hack
context.light = false;
context.fail();
Expand Down Expand Up @@ -278,7 +274,7 @@ Assertion.addChain = function(name, onCall) {
Assertion.alias = function(from, to) {
var desc = Object.getOwnPropertyDescriptor(Assertion.prototype, from);
if (!desc) {
throw new Error('Alias ' + from + ' -> ' + to + ' could not be created as ' + from + ' not defined');
throw new Error("Alias " + from + " -> " + to + " could not be created as " + from + " not defined");
}
Object.defineProperty(Assertion.prototype, to, desc);

Expand All @@ -295,7 +291,7 @@ Assertion.alias = function(from, to) {
* @memberOf Assertion
* @category assertion
*/
Assertion.addChain('not', function() {
Assertion.addChain("not", function() {
this.negate = !this.negate;
});

Expand All @@ -307,11 +303,10 @@ Assertion.addChain('not', function() {
* @memberOf Assertion
* @category assertion
*/
Assertion.addChain('any', function() {
Assertion.addChain("any", function() {
this.anyOne = true;
});


/**
* Only modifier - currently used with .keys to check if object contains only exactly this .keys
*
Expand All @@ -320,6 +315,6 @@ Assertion.addChain('any', function() {
* @memberOf Assertion
* @category assertion
*/
Assertion.addChain('only', function() {
Assertion.addChain("only", function() {
this.onlyThis = true;
});
2 changes: 1 addition & 1 deletion lib/config.js
@@ -1,7 +1,7 @@
/*
* should.js - assertion library
* Copyright(c) 2010-2013 TJ Holowaychuk <tj@vision-media.ca>
* Copyright(c) 2013-2016 Denis Bardadym <bardadymchik@gmail.com>
* Copyright(c) 2013-2017 Denis Bardadym <bardadymchik@gmail.com>
* MIT Licensed
*/

Expand Down
2 changes: 1 addition & 1 deletion lib/ext/assert.js
@@ -1,7 +1,7 @@
/*
* should.js - assertion library
* Copyright(c) 2010-2013 TJ Holowaychuk <tj@vision-media.ca>
* Copyright(c) 2013-2016 Denis Bardadym <bardadymchik@gmail.com>
* Copyright(c) 2013-2017 Denis Bardadym <bardadymchik@gmail.com>
* MIT Licensed
*/

Expand Down
2 changes: 1 addition & 1 deletion lib/ext/bool.js
@@ -1,7 +1,7 @@
/*
* should.js - assertion library
* Copyright(c) 2010-2013 TJ Holowaychuk <tj@vision-media.ca>
* Copyright(c) 2013-2016 Denis Bardadym <bardadymchik@gmail.com>
* Copyright(c) 2013-2017 Denis Bardadym <bardadymchik@gmail.com>
* MIT Licensed
*/

Expand Down
2 changes: 1 addition & 1 deletion lib/ext/chain.js
@@ -1,7 +1,7 @@
/*
* should.js - assertion library
* Copyright(c) 2010-2013 TJ Holowaychuk <tj@vision-media.ca>
* Copyright(c) 2013-2016 Denis Bardadym <bardadymchik@gmail.com>
* Copyright(c) 2013-2017 Denis Bardadym <bardadymchik@gmail.com>
* MIT Licensed
*/

Expand Down
2 changes: 1 addition & 1 deletion lib/ext/contain.js
@@ -1,7 +1,7 @@
/*
* should.js - assertion library
* Copyright(c) 2010-2013 TJ Holowaychuk <tj@vision-media.ca>
* Copyright(c) 2013-2016 Denis Bardadym <bardadymchik@gmail.com>
* Copyright(c) 2013-2017 Denis Bardadym <bardadymchik@gmail.com>
* MIT Licensed
*/

Expand Down
2 changes: 1 addition & 1 deletion lib/ext/eql.js
@@ -1,7 +1,7 @@
/*
* should.js - assertion library
* Copyright(c) 2010-2013 TJ Holowaychuk <tj@vision-media.ca>
* Copyright(c) 2013-2016 Denis Bardadym <bardadymchik@gmail.com>
* Copyright(c) 2013-2017 Denis Bardadym <bardadymchik@gmail.com>
* MIT Licensed
*/

Expand Down
2 changes: 1 addition & 1 deletion lib/ext/error.js
@@ -1,7 +1,7 @@
/*
* should.js - assertion library
* Copyright(c) 2010-2013 TJ Holowaychuk <tj@vision-media.ca>
* Copyright(c) 2013-2016 Denis Bardadym <bardadymchik@gmail.com>
* Copyright(c) 2013-2017 Denis Bardadym <bardadymchik@gmail.com>
* MIT Licensed
*/
import { isIterator, isGeneratorFunction } from 'should-util';
Expand Down
2 changes: 1 addition & 1 deletion lib/ext/match.js
@@ -1,7 +1,7 @@
/*
* should.js - assertion library
* Copyright(c) 2010-2013 TJ Holowaychuk <tj@vision-media.ca>
* Copyright(c) 2013-2016 Denis Bardadym <bardadymchik@gmail.com>
* Copyright(c) 2013-2017 Denis Bardadym <bardadymchik@gmail.com>
* MIT Licensed
*/

Expand Down
2 changes: 1 addition & 1 deletion lib/ext/number.js
@@ -1,7 +1,7 @@
/*
* should.js - assertion library
* Copyright(c) 2010-2013 TJ Holowaychuk <tj@vision-media.ca>
* Copyright(c) 2013-2016 Denis Bardadym <bardadymchik@gmail.com>
* Copyright(c) 2013-2017 Denis Bardadym <bardadymchik@gmail.com>
* MIT Licensed
*/

Expand Down
2 changes: 1 addition & 1 deletion lib/ext/promise.js
@@ -1,7 +1,7 @@
/*
* should.js - assertion library
* Copyright(c) 2010-2013 TJ Holowaychuk <tj@vision-media.ca>
* Copyright(c) 2013-2016 Denis Bardadym <bardadymchik@gmail.com>
* Copyright(c) 2013-2017 Denis Bardadym <bardadymchik@gmail.com>
* MIT Licensed
*/

Expand Down
2 changes: 1 addition & 1 deletion lib/ext/property.js
@@ -1,7 +1,7 @@
/*
* should.js - assertion library
* Copyright(c) 2010-2013 TJ Holowaychuk <tj@vision-media.ca>
* Copyright(c) 2013-2016 Denis Bardadym <bardadymchik@gmail.com>
* Copyright(c) 2013-2017 Denis Bardadym <bardadymchik@gmail.com>
* MIT Licensed
*/

Expand Down
2 changes: 1 addition & 1 deletion lib/ext/string.js
@@ -1,7 +1,7 @@
/*
* should.js - assertion library
* Copyright(c) 2010-2013 TJ Holowaychuk <tj@vision-media.ca>
* Copyright(c) 2013-2016 Denis Bardadym <bardadymchik@gmail.com>
* Copyright(c) 2013-2017 Denis Bardadym <bardadymchik@gmail.com>
* MIT Licensed
*/

Expand Down
2 changes: 1 addition & 1 deletion lib/ext/type.js
@@ -1,7 +1,7 @@
/*
* should.js - assertion library
* Copyright(c) 2010-2013 TJ Holowaychuk <tj@vision-media.ca>
* Copyright(c) 2013-2016 Denis Bardadym <bardadymchik@gmail.com>
* Copyright(c) 2013-2017 Denis Bardadym <bardadymchik@gmail.com>
* MIT Licensed
*/

Expand Down
2 changes: 1 addition & 1 deletion lib/should.js
@@ -1,7 +1,7 @@
/*
* should.js - assertion library
* Copyright(c) 2010-2013 TJ Holowaychuk <tj@vision-media.ca>
* Copyright(c) 2013-2016 Denis Bardadym <bardadymchik@gmail.com>
* Copyright(c) 2013-2017 Denis Bardadym <bardadymchik@gmail.com>
* MIT Licensed
*/
import t from 'should-type';
Expand Down
2 changes: 1 addition & 1 deletion lib/util.js
@@ -1,7 +1,7 @@
/*
* should.js - assertion library
* Copyright(c) 2010-2013 TJ Holowaychuk <tj@vision-media.ca>
* Copyright(c) 2013-2016 Denis Bardadym <bardadymchik@gmail.com>
* Copyright(c) 2013-2017 Denis Bardadym <bardadymchik@gmail.com>
* MIT Licensed
*/
import sformat from 'should-format';
Expand Down

0 comments on commit 6114e76

Please sign in to comment.