Merge pull request #1489 from form8ion/beta

form8ion · Jan 3, 2024 · f917275 · f917275
2 parents 9499626 + fa2fac4
commit f917275
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 5 deletions.
diff --git a/src/lift.js b/src/lift.js
@@ -2,8 +2,14 @@ import deepmerge from 'deepmerge';
 import {applyEnhancers} from '@form8ion/core';
 import {lift as liftReadme} from '@form8ion/readme';
 
+import {test as gitIgnoreExists, lift as liftGitignore} from './vcs/git/ignore/index.js';
+
 export default async function ({projectRoot, results, enhancers, vcs}) {
-  const enhancerResults = await applyEnhancers({results, enhancers, options: {projectRoot, vcs}});
+  const enhancerResults = await applyEnhancers({
+    results,
+    enhancers: {...enhancers, gitIgnore: {test: gitIgnoreExists, lift: liftGitignore}},
+    options: {projectRoot, vcs}
+  });
 
   await liftReadme({projectRoot, results: deepmerge.all([results, enhancerResults])});
 

diff --git a/src/lift.test.js b/src/lift.test.js
@@ -6,6 +6,7 @@ import {afterEach, describe, expect, it, vi} from 'vitest';
 import any from '@travi/any';
 import {when} from 'jest-when';
 
+import {lift as liftGitignore, test as gitIgnoreExists} from './vcs/git/ignore/index.js';
 import lift from './lift.js';
 
 vi.mock('deepmerge');
@@ -25,7 +26,11 @@ describe('lift', () => {
     const enhancerResults = any.simpleObject();
     const mergedResults = any.simpleObject();
     when(core.applyEnhancers)
-      .calledWith({results, enhancers, options: {projectRoot, vcs}})
+      .calledWith({
+        results,
+        enhancers: {...enhancers, gitIgnore: {test: gitIgnoreExists, lift: liftGitignore}},
+        options: {projectRoot, vcs}
+      })
       .mockResolvedValue(enhancerResults);
     when(deepmerge.all).calledWith([results, enhancerResults]).mockReturnValue(mergedResults);
 

diff --git a/test/integration/features/git.feature b/test/integration/features/git.feature
@@ -26,7 +26,6 @@ Feature: Git Repository
     Then the base git files should be present
     And the additional ignores are added to the gitignore
 
-  @wip
   Scenario: already versioned without an existing gitignore
     Given the project root is already initialized as a git repository
     And a language scaffolder is chosen

diff --git a/test/integration/features/lift/git/ignore.feature b/test/integration/features/lift/git/ignore.feature
@@ -5,7 +5,6 @@ Feature: Gitignore
     When the project is lifted
     Then the gitignore file is unchanged
 
-  @wip
   Scenario: additional directories and files
     Given additional directories are provided to be ignored from vcs
     And additional files are provided to be ignored from vcs

diff --git a/test/integration/features/step_definitions/vcs/git-steps.js b/test/integration/features/step_definitions/vcs/git-steps.js
@@ -114,6 +114,6 @@ Then('the gitignore file is unchanged', async function () {
 Then('the gitignore file is added', async function () {
   assert.equal(
     await fs.readFile(`${process.cwd()}/.gitignore`, 'utf-8'),
-    `${this.vcsIgnoreDirectories.join('\n')}\n\n${this.vcsIgnoreFiles.join('\n')}`
+    `\n${this.vcsIgnoreDirectories.join('\n')}\n\n${this.vcsIgnoreFiles.join('\n')}`
   );
 });