Skip to content
This repository has been archived by the owner on Jan 24, 2022. It is now read-only.

Rebase master for 2.4.2 #1115

Merged
merged 5 commits into from
Jul 18, 2019
Merged

Conversation

spalladino
Copy link
Contributor

@spalladino spalladino commented Jul 17, 2019

Cherry picking fixes from master to 2.4 for a 2.4.2 release.

* Handle incorrect keys to loggy

When calling Loggy.success with a non-existing key, the reference would not be found, and the call to path.basename in Loggy._log would fail (since its parameter was null). This commit:

- Catches any exceptions in _log, and displays an error (allowing to continue)
- Adds a testing mode to the logger, which is silent but executes logic, and throws an exception upon issues (only to be used in the CLI and lib tests)
- Fixes incorrect or missing keys in calls to the logger

* Remove failing test
@spalladino spalladino marked this pull request as ready for review July 17, 2019 23:01
@spalladino spalladino force-pushed the release-2.4/rebase-master-for-2.4.2 branch 2 times, most recently from e567c02 to e9a9d85 Compare July 18, 2019 15:58
spalladino and others added 2 commits July 18, 2019 13:09
* Use chai expect throw syntax in Dependency tests

* Use require.resolve to lookup contracts in deps

Change lookup in both Dependency and Contracts classes. Instead of looking for just node_modules in the current folder, it uses require.resolve (relative to the current workdir) to look for the dependency.

Fixes #1076

* Fix tests
@spalladino spalladino force-pushed the release-2.4/rebase-master-for-2.4.2 branch from e9a9d85 to 7cb4caa Compare July 18, 2019 16:09
Copy link
Contributor

@jbcarpanelli jbcarpanelli left a comment

Choose a reason for hiding this comment

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

LGTM! 🚢 🚢 🚢

@jbcarpanelli jbcarpanelli merged commit 282f449 into release/2.4 Jul 18, 2019
@spalladino spalladino deleted the release-2.4/rebase-master-for-2.4.2 branch July 26, 2019 17:57
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.

2 participants