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

Fix wrong order of expected and actual values for members matcher #511

Closed
wants to merge 1 commit into from
Closed

Conversation

eeroan
Copy link

@eeroan eeroan commented Sep 1, 2015

This caused i.e. WebStorm's diff view to show actual value as expected and vice versa.

@keithamus
Copy link
Member

@eeroan thanks for the PR, but it seems like this is failing the test suite - you havent modified the tests, which'll need to be done before this PR can be merged. Are you happy to do that?

@eeroan
Copy link
Author

eeroan commented Sep 1, 2015

Sure. Maybe tomorrow.

On 1.9.2015, at 13.51, Keith Cirkel notifications@github.com wrote:

@eeroan https://github.com/eeroan thanks for the PR, but it seems like this is failing the test suite - you havent modified the tests, which'll need to be done before this PR can be merged. Are you happy to do that?


Reply to this email directly or view it on GitHub #511 (comment).


Eero Anttila <eea@iki.fi mailto:eea@iki.fi>
+358 50 359 0079

@keithamus
Copy link
Member

@eeroan any chance you could update the tests for this PR? I'd be keen to merge it 😄

@eeroan
Copy link
Author

eeroan commented Oct 2, 2015

I tried to fix the tests but it turned out to be a huge change in tests/production code so I gave up :(

Perhaps it’s easier for you, since you are more familiar with the codebase.

On 2.10.2015, at 12.48, Keith Cirkel notifications@github.com wrote:

@eeroan https://github.com/eeroan any chance you could update the tests for this PR? I'd be keen to merge it


Reply to this email directly or view it on GitHub #511 (comment).

@meeber
Copy link
Contributor

meeber commented Apr 10, 2016

Hi! Just change the four #{act} to #{exp} in the lines linked below and you're golden. The error message was previously correct for the old transposed actual/expected, so you'd just be making it correct for the new fixed actual/expected. No additional changes to any other code or tests required :)

, 'expected #{this} to be a superset of #{act}'
, 'expected #{this} to not be a superset of #{act}'

, 'expected #{this} to have the same members as #{act}'
, 'expected #{this} to not have the same members as #{act}'

(Or lemme know if you want me to PR it)

This caused i.e. WebStorm's diff view to show actual value as expected and vice versa.
@eeroan
Copy link
Author

eeroan commented Apr 11, 2016

Tests are now fixed

@@ -129,7 +129,7 @@ module.exports = function (_chai, util) {
*/
Copy link
Member

Choose a reason for hiding this comment

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

This file should be excluded from the diff. See the notes around pull requests here: https://github.com/chaijs/chai/blob/master/CONTRIBUTING.md#pull-requests

Namely:

npm test
# when finished running tests...
git checkout chai.js

@meeber meeber mentioned this pull request May 10, 2016
@meeber
Copy link
Contributor

meeber commented May 10, 2016

Fixed via #702

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

Successfully merging this pull request may close these issues.

None yet

3 participants