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.

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(version): fix content server ver.json properties #789

Merged
merged 3 commits into from Apr 10, 2019

Conversation

Projects
None yet
2 participants
@philbooth
Copy link
Member

commented Apr 10, 2019

Fixes #783. Fixes #787.

server/lib/version.js in the content server needed a couple of tweaks to work with the new monorepo context. These are they.

I also improved the assertions while I was at it, just to make the error messages a bit more helpful.

@mozilla/fxa-devs r?

@philbooth philbooth requested a review from mozilla/fxa-devs Apr 10, 2019

@philbooth philbooth self-assigned this Apr 10, 2019

philbooth added some commits Apr 10, 2019

@philbooth philbooth force-pushed the pb/787-content-server-git-hash branch from e2be788 to 0a0083f Apr 10, 2019

@shane-tomlinson
Copy link
Member

left a comment

r+, thanks @philbooth, mind squashing the commits before merging?

@@ -21,15 +21,22 @@ function versionJson(route) {
assert.equal(res.headers['content-type'], 'application/json; charset=utf-8');

var body = JSON.parse(res.body);
/*eslint-disable sorting/sort-object-props*/
// eslint-disable-next-line sorting/sort-object-props

This comment has been minimized.

Copy link
@shane-tomlinson

@philbooth philbooth merged commit de17973 into master Apr 10, 2019

1 check passed

test Workflow: test
Details

@philbooth philbooth deleted the pb/787-content-server-git-hash branch Apr 10, 2019

@philbooth

This comment has been minimized.

Copy link
Member Author

commented Apr 10, 2019

thanks @philbooth, mind squashing the commits before merging?

Whoops, saw the green tick and merged before I read this, sorry.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.