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

CB-14140 Switch to using fs-extra in favour of shelljs #613

Merged
merged 5 commits into from
Sep 4, 2018

Conversation

dpogue
Copy link
Member

@dpogue dpogue commented May 18, 2018

Nowhere near ready to review or merge, but opening so I can see how the tests are faring on Travis/Appveyor...

Platforms affected

What does this PR do?

What testing has been done on this change?

Checklist

  • Reported an issue in the JIRA database
  • Commit message follows the format: "CB-3232: (android) Fix bug with resolving file paths", where CB-xxxx is the JIRA ID & "android" is the platform affected.
  • Added automated test coverage as appropriate for this change.

@dpogue dpogue closed this Jun 6, 2018
@dpogue dpogue reopened this Jun 6, 2018
@brodybits brodybits changed the title WIP: cleanup & fs-extra CB-14140 WIP: cleanup & fs-extra Jun 15, 2018
@brodybits
Copy link
Contributor

Linking this wonderful change in progress to Apache CB-14140 (https://issues.apache.org/jira/browse/CB-14140).

@raphinesse
Copy link
Contributor

raphinesse commented Jun 22, 2018

I just checked, and other than in integration-tests/HooksRunner.spec.js this does not conflict with #619 😌 And the conflicts that occurred seemed to be easily resolvable.

Should I merge #619 so that you can rebase this?

@brodybits
Copy link
Contributor

Should I merge #619 so that you can rebase this?

+1 I just gave a review with approval on #619.

Would #619 help resolve the CI test failures?

@raphinesse
Copy link
Contributor

@dpogue I've pushed a rebased version of this to my fork

@dpogue
Copy link
Member Author

dpogue commented Jun 22, 2018

@raphinesse Thanks, I won't be able to look at this (or much of anything else) until sometime next week

@brodybits
Copy link
Contributor

@dpogue I've pushed a rebased version of this to my fork

@raphinesse any reason you don't want to finish this one?

Nice work on #619 BTW, wonder if we should apply similar updates to some of the other Cordova repos?

@raphinesse
Copy link
Contributor

@raphinesse any reason you don't want to finish this one?

I'm still working on other cordova stuff (mainly reducing Q-usage) and actually have to get a presentation ready until Tuesday. So time is sparse for me too right now. I'm happy to review this when it's finished.

Nice work on #619 BTW, wonder if we should apply similar updates to some of the other Cordova repos?

See my reply in #619.

@raphinesse
Copy link
Contributor

@dpogue Is 3cb7f1e ready to merge? If so, we could land it in a separate PR for now.

@raphinesse raphinesse changed the title CB-14140 WIP: cleanup & fs-extra CB-14140 WIP: Switch to using fs-extra in favour of shelljs Aug 27, 2018
@raphinesse
Copy link
Contributor

I rebased the changes onto current master. I think we should work on getting this PR merged. It becomes too easily outdated, given the huge impact.

@dpogue
Copy link
Member Author

dpogue commented Aug 28, 2018

yeah... I wish I knew why the dependency order was changing in those plugin install tests with these changes :(

@raphinesse
Copy link
Contributor

raphinesse commented Aug 28, 2018

Unit tests pass now. The problem was that the test relied on the shelljs stubbing for controlling behaviour of cordova-common too.

During debugging, I stumbled across stuff that had been removed in #649 and #666, so we should get them merged ASAP too 😬

@raphinesse
Copy link
Contributor

@dpogue Thanks for the reviews! I'm going to rebase this and see if I can fix (some of) the failing E2E tests.

@raphinesse
Copy link
Contributor

OK, one more failing test in HooksRunner.spec on Node 6 only, but other than that tests are passing. 🎆

@raphinesse
Copy link
Contributor

It is done! 🍾

@raphinesse raphinesse changed the title CB-14140 WIP: Switch to using fs-extra in favour of shelljs CB-14140 Switch to using fs-extra in favour of shelljs Sep 3, 2018
@dpogue
Copy link
Member Author

dpogue commented Sep 4, 2018

🎉 Thanks so much for your work on finishing this! 🙇‍♂️

Do you want these squashed when merging, or kept as distinct commits for historical clarity?

@raphinesse
Copy link
Contributor

raphinesse commented Sep 4, 2018

I kept them separate for the review. Before merging, I'd manually squash most commits. So just let me know when this is good to go and I'll clean it up and get it merged.

raphinesse and others added 5 commits September 4, 2018 20:21
Co-authored-by: Raphael von der Grün <raphinesse@gmail.com>
These tests are broken beyond the scope of switching to fs-extra and
will be fixed separately.
The shelljs usage in the cordova/serve spec is just commented out, since
it has been disabled for some time and is due to be replaced anyway.
@raphinesse
Copy link
Contributor

I squashed some of the commits and will merge (with merge commit) as soon as the CI tests are done.

@raphinesse raphinesse merged commit 26a0595 into apache:master Sep 4, 2018
raphinesse added a commit that referenced this pull request Sep 4, 2018
 CB-14140 Switch to using fs-extra in favour of shelljs
@oliversalzburg
Copy link
Contributor

Just to link these issues: https://github.com/apache/cordova-common/issues/64

As cordova-lib also uses the same fs-extra copy functions, this change is just as much of an issue.

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

Successfully merging this pull request may close these issues.

None yet

4 participants