Merge pull request #1851 from form8ion/alpha

form8ion · Jan 25, 2025 · bad2a50 · bad2a50
2 parents 6150d18 + 028affc
commit bad2a50
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 7 deletions.
diff --git a/src/scaffolder.js b/src/scaffolder.js
@@ -63,7 +63,7 @@ export async function scaffold(options) {
     projectRoot,
     vcs: vcsResults.vcs,
     results: mergedResults,
-    enhancers: {...dependencyUpdaters, ...vcsHosts}
+    enhancers: {...dependencyUpdaters, ...languages, ...vcsHosts}
   });
 
   if (language && language.verificationCommand) {

diff --git a/src/scaffolder.test.js b/src/scaffolder.test.js
@@ -133,7 +133,7 @@ describe('project scaffolder', () => {
       projectRoot: projectPath,
       vcs,
       results: mergedResults,
-      enhancers: {...dependencyUpdaters, ...vcsHosts}
+      enhancers: {...dependencyUpdaters, ...vcsHosts, ...languages}
     });
     expect(resultsReporter.reportResults).toHaveBeenCalledWith(mergedResults);
   });

diff --git a/test/integration/features/scaffold/git.feature b/test/integration/features/scaffold/git.feature
@@ -16,8 +16,10 @@ Feature: Git Repository
   Scenario: to be versioned and hosted
     Given the project should be versioned in git
     And the git repository will be hosted
+    And a language scaffolder is chosen
     When the project is scaffolded
     Then the remote origin is defined
+    And the project repository is hosted on the chosen host
 
   Scenario: already versioned
     Given the project root is already initialized as a git repository

diff --git a/test/integration/features/step_definitions/common-steps.js b/test/integration/features/step_definitions/common-steps.js
@@ -51,6 +51,9 @@ When(/^the project is scaffolded$/, async function () {
 
   this.projectName = 'project-name';
   this.projectDescription = any.sentence();
+  this.projectHomepage = any.url();
+
+  this.languageLiftResults = {...any.simpleObject(), homepage: this.projectHomepage};
 
   await scaffold({
     plugins: {
@@ -66,16 +69,40 @@ When(/^the project is scaffolded$/, async function () {
               info(`Scaffolding ${chosenLanguage} language details for ${projectName}`);
 
               return this.languageScaffolderResults;
+            },
+            test: ({projectRoot}) => {
+              info(`Determining if project at ${projectRoot} uses the ${chosenLanguage} language`);
+
+              return true;
+            },
+            lift: ({projectRoot}) => {
+              info(`Applying the ${chosenLanguage} language lifter to the project at ${projectRoot}`);
+
+              return this.languageLiftResults;
             }
           }
         }
       },
       ...vcsHost && 'Other' !== vcsHost && {
         vcsHosts: {
           [vcsHost]: {
-            scaffold: ({projectName, owner}) => ({
-              vcs: {sshUrl: this.remoteOriginUrl, name: projectName, owner, host: vcsHost}
-            })
+            scaffold: ({projectName, owner}) => {
+              this.hostedVcsDetails = {name: projectName, host: vcsHost};
+
+              return ({
+                vcs: {sshUrl: this.remoteOriginUrl, name: projectName, owner, host: vcsHost}
+              });
+            },
+            test: ({projectRoot}) => {
+              info(`Determining if project at ${projectRoot} uses the ${vcsHost} VCS host`);
+
+              return true;
+            },
+            lift: ({results}) => {
+              this.vcsHostProjectHomepage = results.homepage;
+
+              return results;
+            }
           }
         }
       }

diff --git a/test/integration/features/step_definitions/vcs/vcs-host-steps.js b/test/integration/features/step_definitions/vcs/vcs-host-steps.js
@@ -1,15 +1,24 @@
-import {Given} from '@cucumber/cucumber';
+import {Given, Then} from '@cucumber/cucumber';
 import any from '@travi/any';
+import {assert} from 'chai';
 
 import {questionNames} from '../../../../../src/prompts/question-names.js';
 
 Given('the git repository will be hosted', async function () {
-  this.setAnswerFor(questionNames.REPO_HOST, any.word());
+  const vcsHost = any.word();
+
+  this.setAnswerFor(questionNames.REPO_HOST, vcsHost);
   this.remoteOriginUrl = any.url();
+  this.repoHost = vcsHost;
 });
 
 Given('the repository is hosted on {string}', async function (host) {
   this.repoHost = host;
   this.vcsOwner = any.word();
   this.vcsName = any.word();
 });
+
+Then('the project repository is hosted on the chosen host', async function () {
+  assert.deepEqual(this.hostedVcsDetails, {name: this.projectName, host: this.repoHost});
+  assert.equal(this.vcsHostProjectHomepage, this.projectHomepage);
+});