Skip to content

Commit

Permalink
Merge branch 'master' into change/timezone
Browse files Browse the repository at this point in the history
* master:
  v3.0.2
  Fixed an odd issue where regex was not working correctly causing dates to not be parsed correctly.
  • Loading branch information
shepherdsam committed Feb 13, 2017
2 parents 8d64d2a + 1633544 commit 8015312
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 1 deletion.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).

## [3.0.2] - 2017-02-13

### Fixes
- Fixed an odd issue where regex was not working correctly causing dates to not be parsed correctly.

## [3.0.1] - 2017-02-13

### Fixes
Expand Down Expand Up @@ -151,6 +156,7 @@ backoff.attemptAsync(operation, options).then(res => {
### Added
- Initial release.
[3.0.2]: https://github.com/flowxo/flowxo-utils/compare/v3.0.1...v3.0.2
[3.0.1]: https://github.com/flowxo/flowxo-utils/compare/v3.0.0...v3.0.1
[3.0.0]: https://github.com/flowxo/flowxo-utils/compare/v2.1.0...v3.0.0
[2.1.0]: https://github.com/flowxo/flowxo-utils/compare/v2.0.0...v2.1.0
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "flowxo-utils",
"version": "3.0.1",
"version": "3.0.2",
"description": "Common utilities for Flow XO.",
"main": "lib/index.js",
"scripts": {
Expand Down
5 changes: 5 additions & 0 deletions spec/specs.js
Original file line number Diff line number Diff line change
Expand Up @@ -1160,6 +1160,11 @@ describe('Utils', function() {
var expected = moment('1995-12-26T01:30:00+04:30').toDate();
expectValidDate('1995-12-25T13:30:00+0430 +1d - 12h', expected);
});

it('should work with timezone', function() {
var date = Utils.parseDateTimeField('2016-7-22T00:00:00+01:00', {timezone: 'Europe/London'});
expect(date.moment.toISOString()).toEqual('2016-07-21T23:00:00.000Z');
});
});
});
});
Expand Down

0 comments on commit 8015312

Please sign in to comment.