-
Notifications
You must be signed in to change notification settings - Fork 4.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into jl/bump-queued-request-controller-fix-con…
…firmation-popup-focus
- Loading branch information
Showing
79 changed files
with
3,571 additions
and
2,620 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -75,3 +75,7 @@ lavamoat/**/policy-debug.json | |
|
||
# Attributions | ||
licenseInfos.json | ||
|
||
# API Spec tests | ||
html-report/ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,23 +1,6 @@ | ||
module.exports = { | ||
// TODO: Remove the `exit` setting, it can hide broken tests. | ||
exit: true, | ||
ignore: [ | ||
'./app/scripts/lib/**/*.test.js', | ||
'./app/scripts/migrations/*.test.js', | ||
'./app/scripts/platforms/*.test.js', | ||
'./app/scripts/controllers/app-state.test.js', | ||
'./app/scripts/controllers/permissions/**/*.test.js', | ||
'./app/scripts/controllers/mmi-controller.test.ts', | ||
'./app/scripts/metamask-controller.actions.test.js', | ||
'./app/scripts/detect-multiple-instances.test.js', | ||
'./app/scripts/controllers/swaps.test.js', | ||
'./app/scripts/controllers/metametrics.test.js', | ||
'./app/scripts/controllers/preferences.test.js', | ||
'./app/scripts/constants/error-utils.test.js', | ||
'./app/scripts/metamask-controller.test.js', | ||
'./development/fitness-functions/**/*.test.ts', | ||
'./test/e2e/helpers.test.js', | ||
], | ||
recursive: true, | ||
require: ['test/env.js', 'test/setup.js'], | ||
}; |
120 changes: 0 additions & 120 deletions
120
.yarn/patches/@metamask-keyring-controller-npm-15.0.0-fa070ce311.patch
This file was deleted.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Oops, something went wrong.