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

Sg/fix lint errors #156

Merged
merged 1 commit into from
Sep 7, 2015
Merged

Sg/fix lint errors #156

merged 1 commit into from
Sep 7, 2015

Conversation

StephenGregory
Copy link
Contributor

Changelog:

  • use double quotes instead of single quotes (The .eslintrc specifies using double quotes)
  • update the JSON test objects to be valid JSON.

MiguelCastillo
MiguelCastillo reviewed Aug 17, 2015
View reviewed changes
test/json/array.json
@@ -14,7 +14,7 @@
"year":1937
},
{
"name":Les Demoiselles d'Avignon",
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

all these json files are supposed to be broken. They are a quick way to manually verify if the json linter is reporting errors/warnings correctly.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, sure. Maybe they could be named to invalidArray.json so that the intent is clear?

@MiguelCastillo
Copy link
Owner

cool! The PR looks clean. The JSON file should stay the unchanged since they are broken on purpose to test the JSON linter. :)

@StephenGregory
Copy link
Contributor Author

Ok. I've removed the fixes to the JSON files. Should be good to go 😄

MiguelCastillo
MiguelCastillo reviewed Aug 17, 2015
View reviewed changes
test/json/artists.json
@@ -31,7 +31,7 @@
"year":1889
},
{
'name':"Starry Night Over the Rhone",
"name":"Starry Night Over the Rhone",
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This one also needs to reverted. Single quotes are part of the test. I know we can improve on this quite a bit. I am open to PRs :D

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch! I'll revert this as well.

@StephenGregory StephenGregory force-pushed the sg/fix-lint-errors branch 3 times, most recently from 27e5d34 to d2d9705 Compare August 23, 2015 18:59
@StephenGregory
Copy link
Contributor Author

I have reverted my changes to test/json/artists.json @MiguelCastillo . Should be good to merge now.

@MiguelCastillo
Copy link
Owner

@StephenGregory Havent merged it because there are conflicts with Master... I will merge when we resolve those issues. Thank you so much for your PR

@StephenGregory
Copy link
Contributor Author

Conflicts should now be resolved.

MiguelCastillo added a commit that referenced this pull request Sep 7, 2015
@MiguelCastillo
Merge pull request #156 from StephenGregory/sg/fix-lint-errors
7e946e0 
Sg/fix lint errors
@MiguelCastillo MiguelCastillo merged commit 7e946e0 into MiguelCastillo:master Sep 7, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@StephenGregory @MiguelCastillo