Skip to content
This repository has been archived by the owner on Sep 6, 2021. It is now read-only.

Some unit test fixes #12437

Merged
merged 3 commits into from
May 20, 2016
Merged

Some unit test fixes #12437

merged 3 commits into from
May 20, 2016

Conversation

marcelgerber
Copy link
Contributor

@marcelgerber marcelgerber commented May 19, 2016

Fixes the test failures we see on current master for ProjectModel (Unit), ExtensionManager (Unit) and CSS Code Hints (Extensions).

See the individual commit messages for more information.

Marcel Gerber added 3 commits May 19, 2016 23:53
Caused by interference between #12389 and #12203.
The former utilizes PathUtils, while the latter adapted PathUtils
to our normal require() workflow.
…nd-color'

Caused by our recent CEF upgrade
@nethip
Copy link
Contributor

nethip commented May 20, 2016

Thanks for fixing these @marcelgerber . These changes look good to me.

@nethip nethip merged commit c8a403b into master May 20, 2016
@marcelgerber marcelgerber deleted the marcel/test-fixes branch May 20, 2016 07:14
@ficristo
Copy link
Collaborator

@marcelgerber do you know why the ProjectModel tests needed to be changed?

@marcelgerber
Copy link
Contributor Author

It's because of this newly introduced change: a505026#diff-d93c1799d928e189223d1d4fa75f80dcR816.
Our isWithinProject check works by checking if the file/folder path (/foo before this change) begins with the project root path (/foo/).
I made sure that every path we pass to the function has a trailing /, so this doesn't cause any problems.

@ficristo
Copy link
Collaborator

Thank you!

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.

3 participants