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

sort of fixes #23 #24

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

sort of fixes #23 #24

wants to merge 1 commit into from

Conversation

nfriedly
Copy link

This strips \r's so that the tests pass on windows. I think there's still another bug lurking in there though.

@nfriedly
Copy link
Author

This should be linked to #23

@pflannery
Copy link

I think it would better if we have a .gitattributes file that ensures LF as the default

Like this: https://github.com/google/traceur-compiler/blob/master/.gitattributes

@nfriedly
Copy link
Author

Wouldn't that only affect checkin/checkout? The issue here is that docpad is generating files with OS-appropriate line-endings, but then the test is comparing it to a predefined file with unix-style line-endings.

(Or does DocPad read and honor .gitattributes for generated files?)

@pflannery
Copy link

I've always found on windows that docpad tester generates the actual's with \n and the expected files contain \r\n (only when git EOL is not LF by default on windows)

@nfriedly
Copy link
Author

Oh, I mentally swapped the actual/expected. You're totally right. The only suggestion I might make is to have it scoped to the test/out-expected dir rather than applying to everything.

@nfriedly
Copy link
Author

Although, come to think of it, why is docpad outputting \n's? Shouldn't it just use whatever line ending is in the template?

@balupton
Copy link
Member

balupton commented Aug 1, 2019

I have become too preoccupied by other things to review, merge, and release this PR.

However, you should have received an invite a while ago to join the DocPad Extras Team, which will give you write access to this repository, so you can merge in the PR.

For an orientation, or if you need any assistance following the semi-automatic release process from CONTRIBUTING.md, reach out via https://bevry.me/discord/dev

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants