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.

Sign up for GitHub

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

Jump to bottom

Fix delay option in browser #1800

Closed
wants to merge 1 commit into from
Closed

Fix delay option in browser #1800

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions support/browser-entry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,9 @@ mocha.ui = function(ui){

mocha.setup = function(opts){
if ('string' == typeof opts) opts = { ui: opts };
if ('delay' in opts) {
this.delay(opts.delay);
}
for (var opt in opts) this[opt](opts[opt]);
return this;
};
Expand Down
29 changes: 29 additions & 0 deletions test/browser/delay.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<html>
<head>
<title>Mocha</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="../../mocha.css" />
<script src="../../mocha.js"></script>
<script>
mocha.setup({
ui: 'bdd',
delay: true
})
</script>
<script>
function assert(expr, msg) {
if (!expr) throw new Error(msg);
}
</script>
<script src="delay.js"></script>
<script>
onload = function() {
mocha.run();
};
</script>
</head>
<body>
<div id="mocha"></div>
</body>
</html>
25 changes: 25 additions & 0 deletions test/browser/delay.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
var delay = 500;
var start = new Date().getTime();

describe('delayed execution', function() {
it('should define a global run function', function() {
assert(typeof run === 'function', 'run function is not defined');
});
it('should have waited ' + delay + 'ms to run this suite', function() {
assert(new Date().getTime() - delay >= start, 'did not delay');
});
});

setTimeout(function() {
describe('delayed execution', function() {
it('should be able to define a suite asynchronously', function() {
assert(true);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe this spec could be updated? Rather than the two assert(true), we could have another assertion on the time, ensuring that some number less than delay has elapsed since (start + delay)

});
});

if (typeof run === 'function') {
run();
} else {
mocha.suite.run();
}
}, delay);