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

fix timezone bug in test for @date directive #686

Merged
merged 2 commits into from
Mar 20, 2018
Merged

fix timezone bug in test for @date directive #686

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
a8bb0a4
fix timezone bug test for @date directive
Mar 20, 2018
f0a2457
add timezone bug fix to changelog
Mar 20, 2018
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: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

### vNEXT

* Fix timezone bug in test for @date directive [PR #686](https://github.com/apollographql/graphql-tools/pull/686)

* Expose `defaultMergedResolver` from stitching [PR #685](https://github.com/apollographql/graphql-tools/pull/685)

### v2.23.0
Expand Down
4 changes: 2 additions & 2 deletions src/test/testDirectives.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -592,7 +592,7 @@ describe('@directives', () => {
field.type = GraphQLString;
field.resolve = async function (...args: any[]) {
const date = await resolve.apply(this, args);
return formatDate(date, format);
return formatDate(date, format, true);
};
}
}
Expand All @@ -601,7 +601,7 @@ describe('@directives', () => {
resolvers: {
Query: {
today() {
return new Date(1519688273858);
return new Date(1519688273858).toUTCString();
}
}
}
Expand Down