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

Commit

Permalink
Merge branch 'master' of github.com:shouldjs/should.js
Browse files Browse the repository at this point in the history
  • Loading branch information
btd committed Dec 10, 2016
2 parents 673003e + 04d5ce9 commit 813a5f9
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Follow simple rules:
- Not violate [DRY](http://programmer.97things.oreilly.com/wiki/index.php/Don%27t_Repeat_Yourself).
- [Boy Scout Rule](http://programmer.97things.oreilly.com/wiki/index.php/The_Boy_Scout_Rule) needs to have been applied.

1. Your code should look like all the other code - this project should look like it was written by one man, always.
1. Your code should look like all the other code - this project should look like it was written by one person, always.
2. If you want to propose something - just create an issue and describe your question with as much description as you can.
3. Please never send issues or pull requests about code style, jshint violations etc - I do not accept it (and you will spend your time for free).
4. If you think you have some general improvement, consider creating a pull request with it.
Expand Down
5 changes: 3 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
Copyright (c) 2010-2014 TJ Holowaychuk <[email protected]>
Copyright(c) 2010-2013 TJ Holowaychuk <[email protected]>
Copyright(c) 2013-2016 Denis Bardadym <[email protected]>

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 All @@ -16,4 +17,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
THE SOFTWARE.
2 changes: 1 addition & 1 deletion Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -212,4 +212,4 @@ Also it is possible use it without extension. Just use `require('should/as-funct
## License
MIT &copy; 2010-2014 TJ Holowaychuk
MIT. See LICENSE for details.
3 changes: 2 additions & 1 deletion lib/ext/chain.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ export default function(should, Assertion) {
* @alias Assertion#of
* @alias Assertion#a
* @alias Assertion#and
* @alias Assertion#been
* @alias Assertion#have
* @alias Assertion#has
* @alias Assertion#with
Expand All @@ -25,7 +26,7 @@ export default function(should, Assertion) {
* @alias Assertion#it
* @category assertion chaining
*/
['an', 'of', 'a', 'and', 'be', 'has', 'have', 'with', 'is', 'which', 'the', 'it'].forEach(function(name) {
['an', 'of', 'a', 'and', 'be', 'been', 'has', 'have', 'with', 'is', 'which', 'the', 'it'].forEach(function(name) {
Assertion.addChain(name);
});
}

0 comments on commit 813a5f9

Please sign in to comment.