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

Always provide a devResourcePath in load settings #17903

Merged
merged 3 commits into from Aug 22, 2018

Conversation

Projects
None yet
2 participants
@daviwil
Member

daviwil commented Aug 22, 2018

Description of the Change

This change fixes an issue introduced by PR #17892 which caused Atom's graphical spec runner to stop working. This was caused by a simplification of dev resource path detection logic which left a couple of code paths lacking a proper dev resource path. The solution in this PR is to always add a devResourcePath property to the load settings object that gets created when Atom starts up.

Verification Process

Same verification steps as #17892:

  • atom --dev . uses ATOM_DEV_RESOURCE_PATH if one is set
  • atom --dev . in Atom repo path uses current directory as dev resource path when there is no ATOM_DEV_RESOURCE_PATH set and the current directory appears to be a clone of atom/atom
  • atom --dev . uses ~/github/atom as the dev resource path if it exists and none of the path sources above are present
  • atom --dev . uses its bundled resource path when none of the path sources above are present
  • atom -r path/to/atom overrides all other possible resource path sources

Also validating the following two cases for each of the above items:

  • Package specs for settings-view run successfully
  • Opening Settings view and navigating to Packages tab does not throw an error about missing dependency module
if (devMode) {
resourcePath = devResourcePath
}

This comment has been minimized.

@maxbrunsfeld

maxbrunsfeld Aug 22, 2018

Contributor

Is this conditional (assigning resourcePath = devResourcePath in dev mode) not needed anymore?

@maxbrunsfeld

maxbrunsfeld Aug 22, 2018

Contributor

Is this conditional (assigning resourcePath = devResourcePath in dev mode) not needed anymore?

This comment has been minimized.

@daviwil

daviwil Aug 22, 2018

Member

It shouldn't be needed since it's being done here:

resourcePath = devResourcePath

@daviwil

daviwil Aug 22, 2018

Member

It shouldn't be needed since it's being done here:

resourcePath = devResourcePath

This comment has been minimized.

@maxbrunsfeld

maxbrunsfeld Aug 22, 2018

Contributor

Oh yeah, sweet.

@maxbrunsfeld

maxbrunsfeld Aug 22, 2018

Contributor

Oh yeah, sweet.

@daviwil daviwil merged commit 9aa50b9 into master Aug 22, 2018

3 checks passed

VSTS: Atom Pull Requests 20180822.8 succeeded
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@maxbrunsfeld

This comment has been minimized.

Show comment
Hide comment
@maxbrunsfeld

maxbrunsfeld Aug 22, 2018

Contributor

⚡️

Contributor

maxbrunsfeld commented Aug 22, 2018

⚡️

@maxbrunsfeld maxbrunsfeld deleted the dw-fix-dev-resource-path branch Aug 23, 2018

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