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

[BUGFIX release] Update backburner.js to 1.2.1. #15677

Closed
wants to merge 2 commits into from
Closed

[BUGFIX release] Update backburner.js to 1.2.1. #15677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
98403ab
[BUGFIX release] Update backburner.js to 1.2.1.
rwjblue Sep 21, 2017
cde8718
[BUGFIX beta] Cleanup test to ensure `backburner._platform` is present.
rwjblue Sep 21, 2017
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 package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
"babel-plugin-transform-es2015-template-literals": "^6.22.0",
"babel-plugin-transform-proto-to-assign": "^6.23.0",
"babel-template": "^6.24.1",
"backburner.js": "^1.1.0",
"backburner.js": "^1.2.1",
"broccoli-babel-transpiler": "next",
"broccoli-concat": "^3.2.2",
"broccoli-file-creator": "^1.1.1",
Expand Down
5 changes: 3 additions & 2 deletions packages/ember-metal/tests/run_loop/later_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { assign } from 'ember-utils';
import { run, isNone } from '../..';

const originalSetTimeout = window.setTimeout;
Expand Down Expand Up @@ -198,15 +199,15 @@ asyncTest('setTimeout should never run with a negative wait', function() {
// happens when an expired timer callback takes a while to run,
// which is what we simulate here.
let newSetTimeoutUsed;
run.backburner._platform = {
run.backburner._platform = Object.assign({}, originalPlatform, {
setTimeout() {
let wait = arguments[arguments.length - 1];
newSetTimeoutUsed = true;
ok(!isNaN(wait) && wait >= 0, 'wait is a non-negative number');

return originalPlatform.setTimeout.apply(originalPlatform, arguments);
}
};
});

let count = 0;
run(() => {
Expand Down
6 changes: 3 additions & 3 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -870,9 +870,9 @@ backbone@^1.1.2:
dependencies:
underscore ">=1.8.3"

backburner.js@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/backburner.js/-/backburner.js-1.1.0.tgz#16ef021891bc330a2d021c63d8d68cb8611eb3e4"
backburner.js@^1.2.1:
version "1.2.1"
resolved "https://registry.yarnpkg.com/backburner.js/-/backburner.js-1.2.1.tgz#26adfcd4d06adc80f78be010b3ff90bf44fc7790"

[email protected]:
version "1.0.2"
Expand Down