Skip to content

Commit

Permalink
Merge pull request #739 from ably/improve-mocha-tests
Browse files Browse the repository at this point in the history
Improve Mocha tests
  • Loading branch information
owenpearson authored Apr 20, 2021
2 parents 0a1da2d + 63e0d5f commit ceac0eb
Show file tree
Hide file tree
Showing 43 changed files with 25,139 additions and 12,849 deletions.
7 changes: 7 additions & 0 deletions .prettierrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"trailingComma": "none",
"tabWidth": 2,
"semi": true,
"singleQuote": true,
"printWidth": 120
}
3 changes: 1 addition & 2 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@ module.exports = function(config) {

// following files are loaded by RequireJS
{ pattern: 'browser/static/*.js', included: false },
{ pattern: 'browser/static/*.html', included: false },
{ pattern: 'browser/lib/util/base64.js', included: false },

{ pattern: 'node_modules/async/lib/async.js', included: false },
Expand Down Expand Up @@ -165,7 +164,7 @@ module.exports = function(config) {
// test results reporter to use
// possible values: 'dots', 'progress'
// available reporters: https://npmjs.org/browse/keyword/karma-reporter
reporters: ['dots', 'BrowserStack'],
reporters: ['mocha'],
reportSlowerThan: 5000,

// web server port
Expand Down
10,471 changes: 10,427 additions & 44 deletions package-lock.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
"karma-env-preprocessor": "~0.1",
"karma-firefox-launcher": "~0.1",
"karma-mocha": "^2.0.1",
"karma-mocha-reporter": "^2.2.5",
"karma-requirejs": "~0.2",
"karma-story-reporter": "~0.3",
"kexec": "ably-forks/node-kexec#update-for-node-12",
Expand Down
Loading

0 comments on commit ceac0eb

Please sign in to comment.