Skip to content

Meteor 3.0 compatibility #15

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

Open
polygonwood wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Meteor 3.0 compatibility #15

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
c228a71
adapt dependencies
polygonwood Sep 10, 2024
4ce59ba
drop Fiber test
polygonwood Sep 10, 2024
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
14 changes: 7 additions & 7 deletions package.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ Package.describe({
git: 'https://github.com/iron-meteor/iron-middleware-stack'
});

Package.on_use(function (api) {
api.versionsFrom('METEOR@0.9.2');
Package.onUse(function (api) {
api.versionsFrom('3.0.2');

api.use('underscore');
api.use('ejson');
Expand All @@ -16,15 +16,15 @@ Package.on_use(function (api) {

api.use('iron:url@1.0.11');

api.add_files('lib/handler.js');
api.add_files('lib/middleware_stack.js');
api.addFiles('lib/handler.js');
api.addFiles('lib/middleware_stack.js');
api.export('Handler', {testOnly: true});
});

Package.on_test(function (api) {
Package.onTest(function (api) {
api.use('iron:middleware-stack');
api.use('tinytest');
api.use('test-helpers');
api.add_files('test/handler_test.js');
api.add_files('test/middleware_stack_test.js');
api.addFiles('test/handler_test.js');
api.addFiles('test/middleware_stack_test.js');
});
50 changes: 25 additions & 25 deletions test/middleware_stack_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,31 +152,31 @@ Tinytest.add('MiddlewareStack - dispatch callback', function (test) {
}
});

if (Meteor.isServer) {
var Fiber = Npm.require('fibers');
Tinytest.addAsync('MiddlewareStack - async next maintains fibers', function (test, done) {
var envVar = new Meteor.EnvironmentVariable;
// if (Meteor.isServer) {
// var Fiber = Npm.require('fibers');
// Tinytest.addAsync('MiddlewareStack - async next maintains fibers', function (test, done) {
// var envVar = new Meteor.EnvironmentVariable;

envVar.withValue(true, function () {
var stack = new Iron.MiddlewareStack;
// envVar.withValue(true, function () {
// var stack = new Iron.MiddlewareStack;

test.isTrue(envVar.getOrNullIfOutsideFiber());
stack.push(function(req, res, next) {
// break out of the current fiber
setTimeout(function() {
next();
}, 0);
}, {where: 'server'});

stack.push(function(req, res, next) {
test.isTrue(envVar.getOrNullIfOutsideFiber());
this.next();
}, {where: 'server'});
// test.isTrue(envVar.getOrNullIfOutsideFiber());
// stack.push(function(req, res, next) {
// // break out of the current fiber
// setTimeout(function() {
// next();
// }, 0);
// }, {where: 'server'});

// stack.push(function(req, res, next) {
// test.isTrue(envVar.getOrNullIfOutsideFiber());
// this.next();
// }, {where: 'server'});

stack.dispatch('/', {}, function () {
test.isTrue(envVar.getOrNullIfOutsideFiber());
done();
});
});
});
}
// stack.dispatch('/', {}, function () {
// test.isTrue(envVar.getOrNullIfOutsideFiber());
// done();
// });
// });
// });
// }