Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Spelling #2981

Merged
merged 6 commits into from
Sep 4, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ We must be able to understand the design of your change from this description. K

### Why should this be in core?

<!-- Explain why this functionality should be in mocha as opposed to it's own package -->
<!-- Explain why this functionality should be in mocha as opposed to its own package -->

### Benefits

Expand Down
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -863,7 +863,7 @@ Thanks @entertainyou, @SimenB, @just-paja for the heads-up.
* utils.stringify should handle objects without an Object prototype
* in runnable test, comparing to undefined error's message rather than a literal
* Fix test running output truncation on async STDIO
* ammended for deprecated customFds option in child_process
* amended for deprecated customFds option in child_process

2.1.0 / 2014-12-23
==================
Expand Down Expand Up @@ -1091,7 +1091,7 @@ Thanks @entertainyou, @SimenB, @just-paja for the heads-up.
==================

* add: sort test files with --sort (#813)
* update: diff depedency to 1.0.7
* update: diff dependency to 1.0.7
* update: glob dependency to 3.2.3 (#927)
* fix: diffs show whitespace differences (#976)
* fix: improve global leaks (#783)
Expand Down
2 changes: 1 addition & 1 deletion lib/reporters/base.js
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ exports.cursor = {
};

/**
* Outut the given `failures` as a list.
* Output the given `failures` as a list.
*
* @param {Array} failures
* @api public
Expand Down
2 changes: 1 addition & 1 deletion test/browser/ui.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ describe('$.jQuery', function () {
});

// another generic describe block to verify it is absent
// when greeping on $.jQuery
// when grepping on $.jQuery
describe('@Array', function () {
it('.pop()', function () {
assert(true);
Expand Down
2 changes: 1 addition & 1 deletion test/unit/ms.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ describe('.ms()', function () {
});
});

describe('minutess representation', function () {
describe('minutes representation', function () {
it('should return short format', function () {
expect(ms(time.minutes(1))).to.equal('1m');
});
Expand Down