Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Conversation

@b-strauss
Copy link
Contributor

Fixes #436
Fixes #400

} else {
// Make sure we have proper line endings when testing on Windows.
if (golden != null) golden = golden.replace(/\r\n/g, '\n');
if (output != null) output = output.replace(/\r\n/g, '\n');
Copy link
Contributor

Choose a reason for hiding this comment

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

This seems like the wrong place for this. What about the above check on line 51 for output !== golden? I think this logic should move up to before line 51 perhaps.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Line 54 writes the file on disk. On Windows this would mean \n in written files ... but now that I think about it, output !== golden in line 51 is always false on Windows. I'll change it.

@b-strauss
Copy link
Contributor Author

b-strauss commented Mar 19, 2017

cc @evmar

This can be merged if you approve.

Only 3 more tests left that fail on Windows. \o/

@b-strauss
Copy link
Contributor Author

@evmar hang on a minute I think I can also fix the remaining tests with the regexp.

@b-strauss
Copy link
Contributor Author

b-strauss commented Mar 19, 2017

No, sorry. This can be merged. :)

@evmar evmar merged commit be433bf into angular:master Mar 20, 2017
@b-strauss b-strauss deleted the feature/windows branch March 20, 2017 21:34
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants