Updates from changes in rspec-support #929
Conversation
| @@ -1,3 +1,4 @@ | ||
| Chewy | ||
| bagel. | ||
| + |
There was a problem hiding this comment.
This output is slightly wrong, it's actually -bagel. +bagel. but with a correct line ending, I'm not sure how to reflect this yet but this isn't the way. (Posix specification specifies all lines end with a \n, git would normally warn about the line ending at the end)
There was a problem hiding this comment.
Git prints \ No newline at end of file perhaps we should be looking to print \ No newline at end of input
There was a problem hiding this comment.
Actually, this output is what I'm suggesting as the fix :)
From what I understood, the goal was to represent a trailing newline in the diff output instead of nothing at all. This option represents trailing newline diffs the same ways that other newlines diffs in non-trailing situations do.
I explored adding a string representation where trailing newlines occurred as git does, but it became pretty involved since we add and remove trailing newlines as the output message is crafted in several areas of the code.
Do you have any ideas of what you'd like to see instead?
There was a problem hiding this comment.
Just for the records, google-diff-match-patch represents trailing newlines no different than other newlines.
Are you sure you want all of the code involved with putting in \ No newline at end of input? I'm totally for it, just checking one more time :)
There was a problem hiding this comment.
Seems reasonable, will continue at it!
There was a problem hiding this comment.
Hm, do we want a + or - in front of \ No newline at end of input depending on how it relates to the expected?
Also why I thought maybe just a + or - might be acceptable:
There was a problem hiding this comment.
If you looked at the characters of that file you would find Chewy\nbagel.\n\n Chewy\nbagel.\n
There was a problem hiding this comment.
Having +\ No newline at end of input -\ No newline at end of input works for me.
There was a problem hiding this comment.
Updated specs, still working on escaping, not sure what's going on there.
So, I was using VIM to create t1.txt! I ended up re-learning $ echo -n to see the ouput message we are talking about! Thanks for being patient with me.
| -/expected/m | ||
| +this is the | ||
| + actual | ||
| + string | ||
| """ | ||
|
|
||
| Scenario: diff for a multiline string and a regexp |
There was a problem hiding this comment.
This seems to be a duplicate of another scenario, was this committed accidentally?
at end of PR review.
See rspec-support PR #290
Fixes rspec-support #70