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

Fixes custom timezone tests for Node.js 0.8.x. #730

Closed
wants to merge 1 commit into from
Closed

Fixes custom timezone tests for Node.js 0.8.x. #730

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions test/time/hour-test.js
View file
Open in desktop
Expand Up @@ -42,14 +42,14 @@ suite.addBatch({
assert.deepEqual(floor(utc(2011, 10, 06, 09, 01)), utc(2011, 10, 06, 09));
},
"NPT": {
"observes 15-minute offset": time.zone("Asia/Kathmandu", function(floor) {
"observes 15-minute offset": time.zone(345, function(floor) {
assert.deepEqual(floor(local(2010, 11, 31, 23, 59, 59)), utc(2010, 11, 31, 17, 15));
assert.deepEqual(floor(local(2011, 00, 01, 00, 00, 00)), utc(2010, 11, 31, 18, 15));
assert.deepEqual(floor(local(2011, 00, 01, 00, 00, 01)), utc(2010, 11, 31, 18, 15));
})
},
"IST": {
"observes 30-minute offset": time.zone("Asia/Calcutta", function(floor) {
"observes 30-minute offset": time.zone(330, function(floor) {
assert.deepEqual(floor(local(2010, 11, 31, 23, 59, 59)), utc(2010, 11, 31, 17, 30));
assert.deepEqual(floor(local(2011, 00, 01, 00, 00, 00)), utc(2010, 11, 31, 18, 30));
assert.deepEqual(floor(local(2011, 00, 01, 00, 00, 01)), utc(2010, 11, 31, 18, 30));
Expand Down Expand Up @@ -82,14 +82,14 @@ suite.addBatch({
assert.deepEqual(ceil(utc(2011, 10, 06, 09, 01)), utc(2011, 10, 06, 10));
},
"NPT": {
"observes 15-minute offset": time.zone("Asia/Kathmandu", function(ceil) {
"observes 15-minute offset": time.zone(345, function(ceil) {
assert.deepEqual(ceil(local(2010, 11, 31, 23, 59, 59)), utc(2010, 11, 31, 18, 15));
assert.deepEqual(ceil(local(2011, 00, 01, 00, 00, 00)), utc(2010, 11, 31, 18, 15));
assert.deepEqual(ceil(local(2011, 00, 01, 00, 00, 01)), utc(2010, 11, 31, 19, 15));
})
},
"IST": {
"observes 30-minute offset": time.zone("Asia/Calcutta", function(ceil) {
"observes 30-minute offset": time.zone(330, function(ceil) {
assert.deepEqual(ceil(local(2010, 11, 31, 23, 59, 59)), utc(2010, 11, 31, 18, 30));
assert.deepEqual(ceil(local(2011, 00, 01, 00, 00, 00)), utc(2010, 11, 31, 18, 30));
assert.deepEqual(ceil(local(2011, 00, 01, 00, 00, 01)), utc(2010, 11, 31, 19, 30));
Expand Down
20 changes: 2 additions & 18 deletions test/time/hours-test.js
View file
Open in desktop
Expand Up @@ -49,7 +49,7 @@ suite.addBatch({
]);
},
"NPT": {
"observes 15-minute offset": tz("Asia/Kathmandu", function(range) {
"observes 15-minute offset": time.zone(345, function(range) {
assert.deepEqual(range(local(2011, 10, 7, 0), local(2011, 10, 7, 3)), [
utc(2011, 10, 6, 18, 15),
utc(2011, 10, 6, 19, 15),
Expand All @@ -58,7 +58,7 @@ suite.addBatch({
})
},
"IST": {
"observes 30-minute offset": tz("Asia/Calcutta", function(range) {
"observes 30-minute offset": time.zone(330, function(range) {
assert.deepEqual(range(local(2011, 10, 7, 0), local(2011, 10, 7, 3)), [
utc(2011, 10, 6, 18, 30),
utc(2011, 10, 6, 19, 30),
Expand Down Expand Up @@ -109,20 +109,4 @@ suite.addBatch({
}
});

function tz(tz, scope) {
return function() {
var o = process.env.TZ;
try {
process.env.TZ = tz;
new Date(0).toString(); // invalidate node's dst cache
new Date().toString();
scope.apply(this, arguments);
} finally {
process.env.TZ = o;
new Date(0).toString(); // invalidate node's dst cache
new Date().toString();
}
};
}

suite.export(module);
21 changes: 12 additions & 9 deletions test/time/time.js
View file
Open in desktop
@@ -1,7 +1,9 @@
var offset = 0;

exports.local = function(year, month, day, hours, minutes, seconds, milliseconds) {
var date = new Date();
date.setFullYear(year, month, day);
date.setHours(hours || 0, minutes || 0, seconds || 0, milliseconds || 0);
date.setHours(hours || 0, offset + (minutes || 0), seconds || 0, milliseconds || 0);
return date;
};

Expand All @@ -12,18 +14,19 @@ exports.utc = function(year, month, day, hours, minutes, seconds, milliseconds)
return date;
};

exports.zone = function(tz, scope) {
exports.zone = function(tzOffset, scope) {
return function() {
var o = process.env.TZ;
var o = Date.prototype.getTimezoneOffset;
try {
process.env.TZ = tz;
new Date(0).toString(); // invalidate node's dst cache
new Date().toString();
// Note: assumes the dates are not in DST.
offset = -tzOffset - new Date(0).getTimezoneOffset();
Date.prototype.getTimezoneOffset = function() {
return offset;
};
scope.apply(this, arguments);
} finally {
process.env.TZ = o;
new Date(0).toString(); // invalidate node's dst cache
new Date().toString();
offset = 0;
Date.prototype.getTimezoneOffset = o;
}
};
};