Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mochajs/mocha
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 851ad29309b16878ad7c755158db263337cc4995
Choose a base ref
...
head repository: mochajs/mocha
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5f96d511dbf913f135b92198aab721a27f6b44fe
Choose a head ref

Commits on Mar 7, 2018

  1. update package-lock.json

    boneskull committed Mar 7, 2018
    Copy the full SHA
    aa592f4 View commit details
  2. add .vscode/ to .gitignore

    boneskull committed Mar 7, 2018
    Copy the full SHA
    85cb5c1 View commit details

Commits on Mar 8, 2018

  1. Copy the full SHA
    3d09381 View commit details
  2. Copy the full SHA
    e19e879 View commit details
  3. fix my carelessness in e19e879

    - ensure `lib/mocha.js` is linted but `mocha.js` is not
    boneskull committed Mar 8, 2018
    Copy the full SHA
    86af6bb View commit details
  4. chore(ci): Remove PHANTOMJS_CDNURL, nit

    Seems like PHANTOMJS_CDNURL is not needed anymore now that PhantomJS support is [depracated](https://github.com/mochajs/mocha/blob/6a796cbbcd6c9f805e482c424327c82ed0398dbf/CHANGELOG.md#compatibility).
    
    Please ignore if I am wrong.
    anishkny authored and boneskull committed Mar 8, 2018
    Copy the full SHA
    d76f490 View commit details

Commits on Mar 18, 2018

  1. fix(changelog): update links to some PRs

    Replace /pulls/:id wtih /pull/:id
    tagoro9 authored and boneskull committed Mar 18, 2018
    Copy the full SHA
    27af2cf View commit details
  2. docs: Fix typo in an emoji

    honzajavorek authored and boneskull committed Mar 18, 2018
    Copy the full SHA
    39df783 View commit details
  3. Copy the full SHA
    0060884 View commit details

Commits on Mar 20, 2018

  1. Copy the full SHA
    6383916 View commit details
  2. chore(docs): rewording pending tests

    ematipico authored and boneskull committed Mar 20, 2018
    Copy the full SHA
    ab84f02 View commit details
  3. Fixed linting

    ematipico authored and boneskull committed Mar 20, 2018
    Copy the full SHA
    2c19503 View commit details
  4. Addressed feedback

    ematipico authored and boneskull committed Mar 20, 2018
    Copy the full SHA
    19b764d View commit details

Commits on Mar 21, 2018

  1. Copy the full SHA
    f4275b6 View commit details

Commits on Mar 22, 2018

  1. Copy the full SHA
    19104e3 View commit details
  2. Copy the full SHA
    424ef84 View commit details
  3. append filepath to "timeout exceeded" exception; closes #627- all `Ru…

    …nnable`s *should* now have a `file` property- filepath is appended to the `Error` message in parens- DRY-style refactors
    boneskull committed Mar 22, 2018
    Copy the full SHA
    3633fa0 View commit details
  4. 5
    Copy the full SHA
    c580294 View commit details

Commits on Mar 23, 2018

  1. Copy the full SHA
    2b5d04a View commit details
  2. Release v5.0.5

    boneskull committed Mar 23, 2018
    Copy the full SHA
    ffd760e View commit details

Commits on Apr 1, 2018

  1. #1577 Add "--exclude" Option (#3210)

    * Add --exclude as option.
    
    * Add tests for --exclude option.
    
    * Implement --exclude.
    
    * Update --exclude description.
    
    * Remove old exclude fixture.
    
    * Add new exclude fixture.
    
    * Fix tests for --exclude option.
    
    * Add name to package.contributors.
    
    * Filter new files before they're added.
    
    * Allow multiple --exclude flags rather than using a comma-delimited list.
    
    * Use .fixture extension for exclude fixtures.
    
    * Use runMochaJSON (run) instead of of directInvoke.
    metalex9 authored and boneskull committed Apr 1, 2018
    1
    Copy the full SHA
    8e740c5 View commit details
  2. Refactor Reporter tests (#3272)

    * Closes #3260
    
    * refactor-better test harness for reporters tests'
    
    * refactor-better test harness for reporters tests'
    
    * refactor - some additional work
    
    * refactor - helper func
    
    * refactor - helper func
    
    * refactor - helper func
    
    * fix - improvements to helper functions
    Jerry Muzsik authored and boneskull committed Apr 1, 2018
    Copy the full SHA
    9ba8eca View commit details

Commits on Apr 4, 2018

  1. remove 0-byte file [ci skip]

    Signed-off-by: Christopher Hiller <boneskull@boneskull.com>
    boneskull committed Apr 4, 2018
    Copy the full SHA
    d8522b4 View commit details
  2. use exact version of minimatch [ci skip]

    it's a production dependency, so no wiggle room
    
    Signed-off-by: Christopher Hiller <boneskull@boneskull.com>
    boneskull committed Apr 4, 2018
    Copy the full SHA
    1701335 View commit details
  3. Copy the full SHA
    35dac3e View commit details
  4. upgrade eslint; lint

    Signed-off-by: Christopher Hiller <boneskull@boneskull.com>
    boneskull committed Apr 4, 2018
    Copy the full SHA
    cd1c835 View commit details
  5. add update-contributors script; closes #3289 (#3290)

    * add update-contributors script; closes #3289
    * attempt to fix cache issue with npm@2.x
    
    Signed-off-by: Christopher Hiller <boneskull@boneskull.com>
    boneskull authored Apr 4, 2018
    Copy the full SHA
    f2560e7 View commit details
  6. update stages and build matrices (#3308)

    * optimize build stages and jobs
    * attempt to avoid $TARGET
    * run smoke tests across multiple node versions
    * define addons per-job
    * disable caching for smoke tests; avoid alias
    * disable caching for older node versions entirely
    * combine bundle / browser tests; do not run extra node 9 job
    
    Signed-off-by: Christopher Hiller <boneskull@boneskull.com>
    boneskull authored Apr 4, 2018
    1
    Copy the full SHA
    ff9f3cf View commit details

Commits on Apr 5, 2018

  1. improve caching performance in CI (#3310)

    * add precache stage to warm cache for jobs based default Node.js version
    * re-enable caching for node tests of v6 and v4
    
    Signed-off-by: Christopher Hiller <boneskull@boneskull.com>
    boneskull authored Apr 5, 2018
    Copy the full SHA
    4ae26b2 View commit details
  2. update package-lock.json for v5.0.5 [ci skip]

    Signed-off-by: Christopher Hiller <boneskull@boneskull.com>
    boneskull committed Apr 5, 2018
    Copy the full SHA
    88b9882 View commit details

Commits on Apr 7, 2018

  1. further build improvements (#3315)

    - cache npm itself
    - use `npm ci`
    - cache the npm cache
    - ignore scripts when installing unless necessary
    - cache `node_modules` for `npm install`-using smoke tests
    - prefer flags over env vars
    
    Signed-off-by: Christopher Hiller <boneskull@boneskull.com>
    boneskull authored Apr 7, 2018
    Copy the full SHA
    7544bd3 View commit details
  2. PATH workaround for Travis CI bug

    Signed-off-by: Christopher Hiller <boneskull@boneskull.com>
    boneskull committed Apr 7, 2018
    Copy the full SHA
    d71b80a View commit details
  3. optimize package-scripts.js

    - optimize the output of `npm start` (help) by showing only
      interesting scripts
    - ensure "bundle" tests are running
    - remove "non-TTY" tests, which are not automated (and fail on Windows)
    - rearrange doc-related scripts
    - normalize the descriptions somewhat
    
    Signed-off-by: Christopher Hiller <boneskull@boneskull.com>
    boneskull committed Apr 7, 2018
    Copy the full SHA
    8b6c957 View commit details
  4. doc precision for exclusive tests

    nicgirault authored and boneskull committed Apr 7, 2018
    Copy the full SHA
    94e7289 View commit details
  5. fix wrong version in package.json! [ci skip]

    Signed-off-by: Christopher Hiller <boneskull@boneskull.com>
    boneskull committed Apr 7, 2018
    Copy the full SHA
    8010501 View commit details

Commits on Apr 8, 2018

  1. fix circular objects in json reporter; closes #2433 (#3318)

    original work by @jeversmann; continuation of PR #2559 
    
    Signed-off-by: Christopher Hiller <boneskull@boneskull.com>
    boneskull authored Apr 8, 2018
    Copy the full SHA
    741b0bd View commit details
  2. Tap reporter: report thrown error messages (#3317)

    original work by @chrmod; continuation of PR #2908. 
    
    BREAKING CHANGES; SEMVER MAJOR
    
    Signed-off-by: Christopher Hiller <boneskull@boneskull.com>
    boneskull authored Apr 8, 2018
    Copy the full SHA
    1acea30 View commit details

Commits on Apr 12, 2018

  1. Implement API documentation using npm:documantation.

    Fixes #3138
    Replaces and closes #3239
    
    basically working
    
    Suite and utils work
    
    Runner and Suite datatypes work
    
    Hook extends Runnable - at least link in description
    
    hook is child of mocha and has error
    
    first solid pass
    
    Remove attempted module link from Hook to Runnable because of documentationjs/documentation#820
    
    Switch API documenation to html output, link to them, include in site build
    
    Update TOC
    
    Bring lock file in sync with package.json
    
    Linting
    
    Update package-lock.json
    dfberry authored and Munter committed Apr 12, 2018
    Copy the full SHA
    2f48a23 View commit details
  2. update CHANGELOG for v5.1.0 [ci skip]

    Signed-off-by: Christopher Hiller <boneskull@boneskull.com>
    boneskull committed Apr 12, 2018
    Copy the full SHA
    56e8452 View commit details
  3. Release v5.1.0

    Signed-off-by: Christopher Hiller <boneskull@boneskull.com>
    boneskull committed Apr 12, 2018
    Copy the full SHA
    3ac8e55 View commit details
  4. update package-lock.json [ci skip]

    Signed-off-by: Christopher Hiller <boneskull@boneskull.com>
    boneskull committed Apr 12, 2018
    Copy the full SHA
    58efe58 View commit details

Commits on Apr 18, 2018

  1. fix ESLint problems and consolidate configuration

    - we weren't being strict enough about disallowing ES6.  even though we
      had `es6: false` in the config, the `parserOptions` were set to use
      `ecmaVersion: 8`.  oops
    - linted a couple files
    - deleted all `.eslintrc.yml` files except for the root one; use `overrides`
      instead
    
    Signed-off-by: Christopher Hiller <boneskull@boneskull.com>
    boneskull committed Apr 18, 2018
    Copy the full SHA
    2d1b49c View commit details
  2. update outdated info in docs/README.md [ci skip]

    Signed-off-by: Christopher Hiller <boneskull@boneskull.com>
    boneskull committed Apr 18, 2018
    Copy the full SHA
    07e1ed2 View commit details
  3. update CHANGELOG.md for v5.1.1 [ci skip]

    Signed-off-by: Christopher Hiller <boneskull@boneskull.com>
    boneskull committed Apr 18, 2018
    Copy the full SHA
    d2f6a25 View commit details
  4. Release v5.1.1

    Signed-off-by: Christopher Hiller <boneskull@boneskull.com>
    boneskull committed Apr 18, 2018
    Copy the full SHA
    471ab31 View commit details
  5. Copy the full SHA
    a6115ac View commit details
  6. remove Node.js v7 from AppVeyor build; add Node.js v9

    Signed-off-by: Christopher Hiller <boneskull@boneskull.com>
    boneskull committed Apr 18, 2018
    Copy the full SHA
    e288dbb View commit details
  7. fixed redundant images folders

    loged in commit for CLA (+1 squashed commit)
    Squashed commits:
    [0f603e3] fixed redundant images folders
    
    fixed path in bin/_mocha
    DavNej authored and boneskull committed Apr 18, 2018
    2
    Copy the full SHA
    ad54763 View commit details
  8. update contributors [ci skip]

    Signed-off-by: Christopher Hiller <boneskull@boneskull.com>
    boneskull committed Apr 18, 2018
    Copy the full SHA
    d3d7799 View commit details

Commits on Apr 21, 2018

  1. fix growl asset paths

    Signed-off-by: Christopher Hiller <boneskull@boneskull.com>
    boneskull committed Apr 21, 2018
    Copy the full SHA
    8a909b5 View commit details
Showing 515 changed files with 77,677 additions and 27,902 deletions.
11 changes: 11 additions & 0 deletions .browserslistrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
node >= 14
last 2 Chrome versions
last 2 Edge versions
last 2 Firefox versions
last 2 Safari versions
last 2 Opera versions
unreleased Chrome versions
unreleased Edge versions
unreleased Firefox versions
unreleased Safari versions
unreleased Opera versions
58 changes: 58 additions & 0 deletions .eleventy.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
'use strict';

module.exports = function (eleventyConfig) {
eleventyConfig.addPlugin(
require('@11ty/eleventy-plugin-inclusive-language'),
{
words:
'simply,obviously,basically,of course,clearly,everyone knows,however,easy'
}
);

eleventyConfig.addPassthroughCopy('docs/css');
eleventyConfig.addPassthroughCopy('docs/js');
eleventyConfig.addPassthroughCopy('docs/images');
eleventyConfig.addPassthroughCopy('docs/CNAME');
eleventyConfig.addPassthroughCopy('docs/_headers');
eleventyConfig.addPassthroughCopy('docs/favicon.ico');
eleventyConfig.addPassthroughCopy('docs/example');
eleventyConfig.addPassthroughCopy('docs/api/images');
eleventyConfig.addPassthroughCopy('docs/api/scripts');
eleventyConfig.addPassthroughCopy('docs/api/styles');

/* Markdown Plugins */
const markdown = require('markdown-it')({
html: true,
linkify: true,
typographer: true
});

markdown.use(require('markdown-it-anchor'), {
slugify: require('uslug'),
permalink: true,
permalinkBefore: true,
permalinkClass: 'direct-link',
permalinkSymbol: '#'
});

markdown.use(require('markdown-it-attrs'), {
leftDelimiter: '{:',
rightDelimiter: '}'
});

markdown.use(require('markdown-it-prism'));

markdown.use(require('markdown-it-emoji'));

eleventyConfig.setLibrary('md', markdown);

eleventyConfig.setUseGitIgnore(false);

return {
passthroughFileCopy: true,
dir: {
input: 'docs',
output: 'docs/_site'
}
};
};
12 changes: 11 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,14 @@
coverage/
mocha.js
mocha.js.map
*.fixture.js
docs/
docs/_site
docs/api
docs/_dist
docs/example
out/
!bin/mocha.js
!lib/mocha.js
test/integration/fixtures
!.*.js
*.min.js
101 changes: 94 additions & 7 deletions .eslintrc.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,102 @@
root: true
extends: semistandard
extends:
- semistandard
- plugin:prettier/recommended
env:
node: yes
browser: yes
es6: no
node: true
browser: true
es6: true
parserOptions:
ecmaVersion: 2018
ecmaFeatures:
jsx: false
sourceType: script
rules:
no-var: 0
strict:
- error
- safe
linebreak-style:
- error
- unix
overrides:
- files:
- 'docs/js/**/*.js'
env:
node: false
- files:
- '.eleventy.js'
- '.wallaby.js'
- 'package-scripts.js'
- 'karma.conf.js'
- 'bin/*'
- 'docs/_data/**/*.js'
- 'lib/cli/**/*.js'
- 'lib/nodejs/**/*.js'
- 'scripts/**/*.js'
- 'test/**/*.js'
- 'test/node-unit/**/*.js'
env:
browser: false
- files:
- lib/nodejs/esm-utils.js
- rollup.config.js
- scripts/pick-from-package-json.js
parserOptions:
ecmaVersion: 2018
sourceType: module
requireConfigFile: false # for @babel/eslint-parser
parser: '@babel/eslint-parser'
env:
browser: false
- files:
- test/**/*.{js,mjs}
env:
mocha: true
globals:
expect: readonly
- files:
- bin/*
- lib/**/*.js
rules:
no-restricted-globals:
- error
- name: setTimeout
message: &GH-237 See https://github.com/mochajs/mocha/issues/237
- name: clearTimeout
message: *GH-237
- name: setInterval
message: *GH-237
- name: clearInterval
message: *GH-237
- name: setImmediate
message: *GH-237
- name: clearImmediate
message: *GH-237
- name: Date
message: *GH-237
no-restricted-modules:
- error
- timers
no-restricted-syntax:
- error
# disallow `global.setTimeout()`, `global.setInterval()`, etc.
- selector: 'CallExpression[callee.object.name=global][callee.property.name=/(set|clear)(Timeout|Immediate|Interval)/]'
message: *GH-237
# disallow `new global.Date()`
- selector: 'NewExpression[callee.object.name=global][callee.property.name=Date]'
message: *GH-237
# disallow property access of `global.<timer>.*`
- selector: '*[object.object.name=global][object.property.name=/(Date|(set|clear)(Timeout|Immediate|Interval))/]:expression'
message: *GH-237
- files:
- test/**/*.mjs
parserOptions:
ecmaVersion: 2018
sourceType: module

- files:
- lib/reporters/*.js
rules:
no-restricted-syntax:
- error
# disallow Reporters using `console.log()`
- selector: 'CallExpression[callee.object.name=console][callee.property.name=log]'
message: &GH-3604 See https://github.com/mochajs/mocha/issues/3604
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* text=auto eol=lf
54 changes: 45 additions & 9 deletions .github/CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -33,14 +33,14 @@ community should be respectful when dealing with other members as well as with p
We are a community of professionals, and we conduct ourselves professionally. Be kind to others. Do not insult or put
down other participants. Harassment and other exclusionary behavior aren’t acceptable. This includes, but is not limited to:

* Violent threats or language directed against another person.
* Discriminatory jokes and language.
* Posting sexually explicit or violent material.
* Posting (or threatening to post) other people’s personally identifying information (“doxing”).
* Personal insults, especially those using racist or sexist terms.
* Unwelcome sexual attention.
* Advocating for, or encouraging, any of the above behavior.
* Repeated harassment of others. In general, if someone asks you to stop, then stop.
- Violent threats or language directed against another person.
- Discriminatory jokes and language.
- Posting sexually explicit or violent material.
- Posting (or threatening to post) other people’s personally identifying information (“doxing”).
- Personal insults, especially those using racist or sexist terms.
- Unwelcome sexual attention.
- Advocating for, or encouraging, any of the above behavior.
- Repeated harassment of others. In general, if someone asks you to stop, then stop.

## When we disagree, try to understand why

@@ -55,4 +55,40 @@ Original text courtesy of the Speak Up! project and Django Project.

## QUESTIONS?

If you have questions, please see the FAQ. If that doesn’t answer your questions, feel free to email conduct@js.foundation.
If you have questions, please see the FAQ. If that doesn’t answer your questions, feel free to email report@lists.openjsf.org.

# OpenJS Foundation Code of Conduct

The OpenJS Foundation and its member projects use the Contributor
Covenant v1.4.1 as its Code of Conduct. Refer to the following
for the full text:

- [english](https://www.contributor-covenant.org/version/1/4/code-of-conduct)
- [translations](https://www.contributor-covenant.org/translations)

Refer to the section on reporting and escalation in this document for the specific emails that can be used to report and escalate issues.

## Reporting

### Project Spaces

For reporting issues in spaces related to a member project please use the email provided by the project for reporting. Projects handle CoC issues related to the spaces that they maintain. Projects maintainers commit to:

- maintain the confidentiality with regard to the reporter of an incident
- to participate in the path for escalation as outlined in
the section on Escalation when required.

### Foundation Spaces

For reporting issues in spaces managed by the OpenJS Foundation, for example, repositories within the OpenJS organization, use the email `report@lists.openjsf.org`. The Cross Project Council (CPC) is responsible for managing these reports and commits to:

- maintain the confidentiality with regard to the reporter of an incident
- to participate in the path for escalation as outlined in
the section on Escalation when required.

## Escalation

The OpenJS Foundation maintains a Code of Conduct Panel (CoCP). This is a foundation-wide team established to manage escalation when a reporter believes that a report to a member project or the CPC has not been properly handled. In order to escalate to the CoCP send an email to `"coc-escalation@lists.openjsf.org`.

For more information, refer to the full
[Code of Conduct governance document](https://github.com/openjs-foundation/cross-project-council/blob/master/FOUNDATION_CODE_OF_CONDUCT_REQUIREMENTS.md).
Loading