Merge pull request #19 from sitecoremaster/bugs/parent-unicorn-fix

Bugs/parent unicorn fix
dylanyoung-dev · Apr 13, 2019 · 747f115 · 747f115
2 parents f1b590c + 2d26a57
commit 747f115
Show file tree

Hide file tree

Showing 7 changed files with 1,581 additions and 31 deletions.
diff --git a/generators/create-module/helix-project/index.js b/generators/create-module/helix-project/index.js
@@ -157,11 +157,12 @@ module.exports = class extends Generator {
     _configureSerializedItems() {
 
         // Templates
-        this.fs.copyTpl(this.templatePath('./serialization/Templates/.Template.yml'), this.destinationPath(path.join(this.targetPath, 'serialization/', 'Templates/', parameters.ModuleName + '.yml')), { Parameters: parameters, Id: guid.v4() });
+        var templateId = guid.v4();
+        this.fs.copyTpl(this.templatePath('./serialization/Templates/.Template.yml'), this.destinationPath(path.join(this.targetPath, 'serialization/', 'Templates/', parameters.ModuleName + '.yml')), { Parameters: parameters, Id: templateId });
 
         mkdir.sync(path.join(this.targetPath, 'serialization', 'Templates', parameters.ModuleName));
 
-        this.fs.copyTpl(this.templatePath('./serialization/Templates/.Home.yml'), this.destinationPath(path.join(this.targetPath, 'serialization/', 'Templates/', parameters.ModuleName, 'Home.yml')), { Parameters: parameters, Id: guid.v4() });
+        this.fs.copyTpl(this.templatePath('./serialization/Templates/.Home.yml'), this.destinationPath(path.join(this.targetPath, 'serialization/', 'Templates/', parameters.ModuleName, 'Home.yml')), { Parameters: parameters, Id: guid.v4(), ParentId: templateId });
 
         // Renderings
         this.fs.copyTpl(this.templatePath('./serialization/Renderings/.Rendering.yml'), this.destinationPath(path.join(this.targetPath, 'serialization/', 'Renderings/', parameters.ModuleName + '.yml')), { Parameters: parameters, Id: guid.v4() });
@@ -177,11 +178,12 @@ module.exports = class extends Generator {
         this.fs.copyTpl(this.templatePath('./serialization/Media/.Media.yml'), this.destinationPath(path.join(this.targetPath, 'serialization/', 'Media/', parameters.ModuleName + '.yml')), { Parameters: parameters, Id: guid.v4() });
 
         // Content Items
-        this.fs.copyTpl(this.templatePath('./serialization/Content/.Folder.yml'), this.destinationPath(path.join(this.targetPath, 'serialization', 'Content', parameters.ModuleName + '.yml')), { Parameters: parameters, Id: guid.v4() });
+        var folderId = guid.v4();
+        this.fs.copyTpl(this.templatePath('./serialization/Content/.Folder.yml'), this.destinationPath(path.join(this.targetPath, 'serialization', 'Content', parameters.ModuleName + '.yml')), { Parameters: parameters, Id: folderId });
 
         mkdir.sync(path.join(this.targetPath, 'serialization', 'Content', parameters.ModuleName));
 
-        this.fs.copyTpl(this.templatePath('./serialization/Content/.Home.yml'), this.destinationPath(path.join(this.targetPath, 'serialization', 'Content', parameters.ModuleName, 'Home.yml')), { Parameters: parameters, Id: guid.v4() });
+        this.fs.copyTpl(this.templatePath('./serialization/Content/.Home.yml'), this.destinationPath(path.join(this.targetPath, 'serialization', 'Content', parameters.ModuleName, 'Home.yml')), { Parameters: parameters, Id: guid.v4(), ParentId: folderId });
 
     }
 

diff --git a/generators/create-module/helix-project/templates/serialization/Content/.Home.yml b/generators/create-module/helix-project/templates/serialization/Content/.Home.yml
@@ -1,6 +1,6 @@
 ---
 ID: "<%= Id %>"
-Parent: "71b6ecaa-e1ea-4757-b8bd-f533a469a750"
+Parent: "<%= ParentId %>"
 Template: "19cb0203-de9c-4700-81d7-986c1b7c230d"
 Path: /sitecore/content/<%= Parameters.ModuleName %>/Home
 DB: master

diff --git a/generators/create-module/helix-project/templates/serialization/Templates/.Home.yml b/generators/create-module/helix-project/templates/serialization/Templates/.Home.yml
@@ -1,6 +1,6 @@
 ---
 ID: "<%= Id %>"
-Parent: "384bbdf5-520c-4a36-aeb6-ccb2bbbf8a56"
+Parent: "<%= ParentId %>"
 Template: "ab86861a-6030-46c5-b394-e8f99e8b87db"
 Path: /sitecore/templates/Project/<%= Parameters.ModuleName %>/Home
 DB: master

diff --git a/generators/package.json b/generators/package.json
@@ -10,8 +10,8 @@
   ],
   "scripts": {
     "postinstall": "",
-    "test": "mocha tests/*.tests.js --timeout 60000 --config generators/test/mocha.opts",
-    "test-report": "mocha tests/*.tests.js --reporter mocha-junit-reporter --timeout 60000 --config generators/test/mocha.opts"
+    "test": "mocha tests/*.tests.js --timeout 60000",
+    "test-report": "mocha tests/*.tests.js --reporter mocha-junit-reporter --timeout 60000"
   },
   "dependencies": {
     "chalk": "^1.1.3",

diff --git a/generators/tests/mocha.opts b/generators/tests/mocha.opts