Skip to content

Commit

Permalink
feat(homepage): expect homepage to be defined as part of lifting ra…
Browse files Browse the repository at this point in the history
…ther than scaffolding
  • Loading branch information
travi committed Jan 24, 2025
1 parent e912e24 commit 1ead958
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 20 deletions.
3 changes: 1 addition & 2 deletions src/scaffolder/scaffolder.js
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,6 @@ export default async function (options) {
documentation: scaffoldDocumentation({projectTypeResults, packageManager}),
tags: projectTypeResults.tags,
vcsIgnore: buildVcsIgnoreLists(mergedContributions.vcsIgnore),
verificationCommand: `${buildDocumentationCommand(packageManager)} && ${packageManager} test`,
// projectDetails: {...liftResults.homepage && {homepage: liftResults.homepage}},
verificationCommand: `${buildDocumentationCommand(packageManager)} && ${packageManager} test`
};
}
17 changes: 0 additions & 17 deletions src/scaffolder/scaffolder.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import scaffoldDocumentation from '../documentation/index.js';
import {validate} from '../options/validator.js';
import buildBadgesDetails from '../documentation/badges.js';
import {prompt} from '../prompts/questions.js';
import lift from '../lift/index.js';
import scaffold from './scaffolder.js';

vi.mock('deepmerge');
Expand All @@ -41,7 +40,6 @@ vi.mock('../documentation/index.js');
vi.mock('../options/validator.js');
vi.mock('../prompts/questions.js');
vi.mock('../documentation/badges.js');
vi.mock('../lift/index.js');
vi.mock('./verification/index.js');

describe('javascript project scaffolder', () => {
Expand Down Expand Up @@ -226,9 +224,6 @@ describe('javascript project scaffolder', () => {
projectTypePluginResults
])
.mockReturnValue(mergedResults);
when(deepmerge)
.calledWith({devDependencies: ['npm-run-all2'], packageManager}, mergedResults)
.mockReturnValue(scaffoldingResults);
});

it('should scaffold the javascript details', async () => {
Expand All @@ -245,21 +240,9 @@ describe('javascript project scaffolder', () => {
documentation,
tags,
badges: badgeResults,
// projectDetails: {},
vcsIgnore,
verificationCommand: `${documentationCommand} && ${packageManager} test`
});
expect(scaffoldPackageManager).toHaveBeenCalledWith({projectRoot, packageManager});
});

it.skip('should return the project homepage when available', async () => {
const homepage = any.url();
when(lift)
.calledWith({projectRoot, vcs, pathWithinParent, configs, results: scaffoldingResults})
.mockResolvedValue({homepage});

const {projectDetails} = await scaffold(options);

expect(projectDetails.homepage).toEqual(homepage);
});
});
2 changes: 1 addition & 1 deletion test/integration/features/step_definitions/common-steps.js
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ Then('the expected results for a(n) {string} are returned to the project scaffol

assertHomepageDefinedProperly(homepage, this.projectType, this.projectName, this.npmAccount, this.vcs);
assertHomepageDefinedProperly(
this.scaffoldResult.projectDetails.homepage,
this.liftResult.homepage,
this.projectType,
this.projectName,
this.npmAccount,
Expand Down

0 comments on commit 1ead958

Please sign in to comment.