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 Immutable 4 merging. Again. #3808

Merged
merged 2 commits into from
Feb 1, 2018

Conversation

dagstuan
Copy link
Contributor

@dagstuan dagstuan commented Feb 1, 2018

Turns out the list-merging was still broken in 7.2.2 since I hadnt bothered to test arrays with content in them already, immutable.js@4.0.0-rc.5+ concats lists when merging them. This PR does the merging by hand instead of using a built in method to do it, and I added a test for it, so it shouldnt break in the future. I have tested this solution both with immutable@3.8.2 and immutable@4.0.0-rc.9. Sorry for the broken PR that got merged in 7.2.2.

… Had to do it by hand instead of using built in methods
@codecov-io
Copy link

codecov-io commented Feb 1, 2018

Codecov Report

Merging #3808 into master will not change coverage.
The diff coverage is 100%.

Impacted file tree graph

@@          Coverage Diff           @@
##           master   #3808   +/-   ##
======================================
  Coverage     100%    100%           
======================================
  Files          70      70           
  Lines        1602    1601    -1     
======================================
- Hits         1602    1601    -1
Impacted Files Coverage Δ
src/structure/immutable/setIn.js 100% <100%> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 421569e...41970cf. Read the comment docs.

@erikras erikras merged commit a8471be into redux-form:master Feb 1, 2018
@lock
Copy link

lock bot commented Jun 1, 2018

This thread has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

@lock lock bot locked as resolved and limited conversation to collaborators Jun 1, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants