Skip to content
This repository was archived by the owner on Dec 15, 2022. It is now read-only.

Fix failing test that overrides core packages #300

Merged
merged 6 commits into from
Feb 13, 2020
Merged

Fix failing test that overrides core packages #300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7fb8873
fixed failing test that overrides core packages
darangi Feb 12, 2020
2de9091
debugging
darangi Feb 12, 2020
b466330
return language-javascript at the end
darangi Feb 13, 2020
4a16124
logged package path
darangi Feb 13, 2020
ea95e55
removed log
darangi Feb 13, 2020
8e9bc64
updated regex used to sort packages
darangi Feb 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/snippets.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ module.exports = {
loadPackageSnippets (callback) {
const disabledPackageNames = atom.config.get('core.packagesWithSnippetsDisabled') || []
const packages = atom.packages.getLoadedPackages().sort((pack, _) => {
return /\/app\.asar\/node_modules\//.test(pack.path) ? -1 : 1
return /\/node_modules\//.test(pack.path) ? -1 : 1
})

const snippetsDirPaths = []
Expand Down
4 changes: 2 additions & 2 deletions spec/snippet-loading-spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,10 @@ describe("Snippet Loading", () => {

describe("::loadPackageSnippets(callback)", () => {
beforeEach(() => { // simulate a list of packages where the javascript core package is returned at the end
atom.packages.getLoadedPackages.andReturn([
atom.packages.getLoadedPackages.andReturn([
atom.packages.loadPackage(path.join(__dirname, 'fixtures', 'package-with-snippets')),
atom.packages.loadPackage('language-javascript')
]);
])
});

it("allows other packages to override core packages' snippets", () => {
Expand Down