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

[4.2] Fixed Tests On Windows #5720

Merged
merged 1 commit into from Sep 30, 2014
Merged

[4.2] Fixed Tests On Windows #5720

merged 1 commit into from Sep 30, 2014

Conversation

GrahamCampbell
Copy link
Member

On windows, laravel will still return linux style new lines, so it's incorrect for the tests to use the php eol constant, thus the tests were failing before I made this fix.

@franzliedke
Copy link
Contributor

Interesting, I've tried before to fix these, but failed.

What's the output of git config core:autocrlf on your machine?

@GrahamCampbell
Copy link
Member Author 

[user]
    name = Graham Campbell
    email = graham@mineuk.com
[merge]
    tool = kdiff3
[mergetool "kdiff3"]
    path = C:/Program Files (x86)/KDiff3/kdiff3.exe
[diff]
    guitool = kdiff3
[difftool "kdiff3"]
    path = C:/Program Files (x86)/KDiff3/kdiff3.exe
[core]
    editor = \"C:/Program Files (x86)/GitExtensions/GitExtensions.exe\" fileeditor
    autocrlf = false
    eol = lf

@GrahamCampbell
Copy link
Member Author

In most of my repos, I have * text=auto enabled so everything ends up with lf line endings.

@franzliedke
Copy link
Contributor

I think the view tests may not work when core.autocrlf is set to true.

Still, this is an improvement. 👍

@GrahamCampbell
Copy link
Member Author

Ping @taylorotwell.

@taylorotwell
Copy link
Member

Please don't ping me.

@GrahamCampbell
Copy link
Member Author

Sorry, this is just a pain for me because I have to apply this patch to my code, then remove it again every time I want to contribute to laravel.

taylorotwell added a commit that referenced this pull request Sep 30, 2014
@taylorotwell
Merge pull request #5720 from GrahamCampbell/4.2-windows
8615680 
[4.2] Fixed Tests On Windows
@taylorotwell taylorotwell merged commit 8615680 into laravel:4.2 Sep 30, 2014
@GrahamCampbell GrahamCampbell deleted the 4.2-windows branch September 30, 2014 22:47
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
bug
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@GrahamCampbell @franzliedke @taylorotwell