mcdev 7.0.4 → 7.1.1

package/test/resources/9999999/script/get_mixed-rcb-key-expected.html

@@ -5,8 +5,8 @@ line1
 %%[
     SET @test = 'bla bla'
 ]%%
-line2 %%= ContentBlockByKey("mcdev-issue-1157") =%% still line2; collapsed to line2 because it's assumed
+line2 %%= ContentBlockByKey("testExisting_asset_htmlblock") =%% still line2; collapsed to line2 because it's assumed
 HTML
 <script runat="server">
-    Platform.Function.ContentBlockByKey("mcdev-issue-1157");
+    Platform.Function.ContentBlockByKey("testExisting_asset_htmlblock");
 </script>

package/test/resources/9999999/senderProfile/get-rcb-key-expected.json

@@ -4,11 +4,11 @@
     "CustomerKey": "testExisting_senderProfile_rcb",
     "Name": "testExisting_senderProfile_rcb",
     "Description": "Send from joern.berkefeld@accenture.com",
-    "FromName": "%%= ContentBlockByKey(\"mcdev-issue-1157\") =%%",
-    "FromAddress": "%%= ContentBlockByKey(\"mcdev-issue-1157\") =%%",
+    "FromName": "%%= ContentBlockByKey(\"testExisting_asset_htmlblock\") =%%",
+    "FromAddress": "%%= ContentBlockByKey(\"testExisting_asset_htmlblock\") =%%",
     "UseDefaultRMMRules": true,
-    "AutoForwardToEmailAddress": "%%= ContentBlockByKey(\"mcdev-issue-1157\") =%%",
-    "AutoForwardToName": "%%= ContentBlockByKey(\"mcdev-issue-1157\") =%%",
+    "AutoForwardToEmailAddress": "%%= ContentBlockByKey(\"testExisting_asset_htmlblock\") =%%",
+    "AutoForwardToName": "%%= ContentBlockByKey(\"testExisting_asset_htmlblock\") =%%",
     "DirectForward": false,
     "AutoReply": false,
     "SenderHeaderEmailAddress": "",

package/test/resources/9999999/senderProfile/retrieve-response.xml

@@ -66,7 +66,7 @@
                 <Name>testExisting_senderProfile_rcb</Name>
                 <Description>Send from joern.berkefeld@accenture.com</Description>
                 <FromName>%%= ContentBlockByName("Content Builder\dont strip non ssjs content") =%%</FromName>
-                <FromAddress>%%= ContentBlockByKey("mcdev-issue-1157") =%%</FromAddress>
+                <FromAddress>%%= ContentBlockByKey("testExisting_asset_htmlblock") =%%</FromAddress>
                 <UseDefaultRMMRules>true</UseDefaultRMMRules>
                 <AutoForwardToEmailAddress>%%= ContentBlockById(1295064) =%%</AutoForwardToEmailAddress>
                 <AutoForwardToName>%%= ContentBlockById(1295064) =%%</AutoForwardToName>

package/test/resources/9999999/triggeredSend/get-rcb-key-expected.json

@@ -7,10 +7,10 @@
     "CreatedDate": "2018-06-25T05:58:00",
     "CustomerKey": "testExisting_triggeredSend_rcb",
     "Description": "Unsubscribe_Email",
-    "DynamicEmailSubject": "%%= ContentBlockByKey(\"mcdev-issue-1157\") =%%",
-    "EmailSubject": "%%= ContentBlockByKey(\"mcdev-issue-1157\") =%%",
-    "FromAddress": "%%= ContentBlockByKey(\"mcdev-issue-1157\") =%%",
-    "FromName": "%%= ContentBlockByKey(\"mcdev-issue-1157\") =%%",
+    "DynamicEmailSubject": "%%= ContentBlockByKey(\"testExisting_asset_htmlblock\") =%%",
+    "EmailSubject": "%%= ContentBlockByKey(\"testExisting_asset_htmlblock\") =%%",
+    "FromAddress": "%%= ContentBlockByKey(\"testExisting_asset_htmlblock\") =%%",
+    "FromName": "%%= ContentBlockByKey(\"testExisting_asset_htmlblock\") =%%",
     "IsMultipart": false,
     "IsWrapped": true,
     "Keyword": "",

package/test/resources/9999999/triggeredSendDefinition/retrieve-TriggeredSendStatusINNew,Active,Inactive,Moved,Canceled-response.xml

@@ -94,7 +94,7 @@
                     <CustomerKey>testExisting_senderProfile_rcb</CustomerKey>
                 </SenderProfile>
                 <FromName>%%= ContentBlockByName("Content Builder\dont strip non ssjs content") =%%</FromName>
-                <FromAddress>%%= ContentBlockByKey("mcdev-issue-1157") =%%</FromAddress>
+                <FromAddress>%%= ContentBlockByKey("testExisting_asset_htmlblock") =%%</FromAddress>
                 <SuppressTracking>false</SuppressTracking>
                 <TriggeredSendType>Continuous</TriggeredSendType>
                 <TriggeredSendStatus>New</TriggeredSendStatus>

package/test/type.asset.test.js

@@ -156,24 +156,35 @@ describe('type: asset', () => {
                 retrieve['testInstance/testBU'].asset
                     ? Object.keys(retrieve['testInstance/testBU'].asset).length
                     : 0,
-                5,
-                'only 5 assets expected in retrieve response'
+                8,
+                'Unexpected number of assets in retrieve response'
             );
             // get results from cache
             const result = cache.getCache();
             assert.equal(
                 result.asset ? Object.keys(result.asset).length : 0,
-                5,
-                'only 5 assets expected in cache'
+                8,
+                'Unexpected number of assets in cache'
             );
 
             assert.deepEqual(
-                await getActualJson('mcdev-issue-1157', 'asset', 'block'),
-                await testUtils.getExpectedJson('9999999', 'asset', 'block-1157-retrieve'),
+                await getActualJson('testExisting_asset_htmlblock', 'asset', 'block'),
+                await testUtils.getExpectedJson(
+                    '9999999',
+                    'asset',
+                    'testExisting_asset_htmlblock-retrieve'
+                ),
                 'returned metadata was not equal expected'
             );
-            expect(await getActualFile('mcdev-issue-1157', 'asset', 'block', 'html')).to.equal(
-                await testUtils.getExpectedFile('9999999', 'asset', 'block-1157-retrieve', 'html')
+            expect(
+                await getActualFile('testExisting_asset_htmlblock', 'asset', 'block', 'html')
+            ).to.equal(
+                await testUtils.getExpectedFile(
+                    '9999999',
+                    'asset',
+                    'testExisting_asset_htmlblock-retrieve',
+                    'html'
+                )
             );
 
             assert.deepEqual(
@@ -216,7 +227,50 @@ describe('type: asset', () => {
 
             assert.equal(
                 testUtils.getAPIHistoryLength(),
-                15,
+                21,
+                'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
+            );
+            return;
+        });
+
+        it('Should retrieve a asset by key', async () => {
+            // WHEN
+            const retrieve = await handler.retrieve(
+                'testInstance/testBU',
+                ['asset'],
+                ['testExisting_asset_htmlblock']
+            );
+
+            // THEN
+            assert.equal(process.exitCode, 0, 'retrieve should not have thrown an error');
+            assert.equal(
+                retrieve['testInstance/testBU'].asset
+                    ? Object.keys(retrieve['testInstance/testBU'].asset).length
+                    : 0,
+                1,
+                'Unexpected number of assets in retrieve response'
+            );
+            // get results from cache
+            const result = cache.getCache();
+            assert.equal(
+                result.asset ? Object.keys(result.asset).length : 0,
+                6,
+                'Unexpected number of assets in cache'
+            );
+
+            assert.deepEqual(
+                await getActualJson('testExisting_asset_htmlblock', 'asset', 'block'),
+                await testUtils.getExpectedJson(
+                    '9999999',
+                    'asset',
+                    'testExisting_asset_htmlblock-retrieve'
+                ),
+                'returned metadata was not equal expected'
+            );
+
+            assert.equal(
+                testUtils.getAPIHistoryLength(),
+                8,
                 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
             );
             return;
@@ -229,6 +283,7 @@ describe('type: asset', () => {
         });
 
         it('Should create an asset with mis-matching memberId, automatically adding the MID suffix', async () => {
+            handler.setOptions({ autoMidSuffix: true });
             // WHEN
             const deployResult = await handler.deploy(
                 'testInstance/testBU',
@@ -250,7 +305,7 @@ describe('type: asset', () => {
             assert.equal(
                 upsertCallout?.customerKey,
                 'testNew_asset-9999999',
-                'customerKey should be testNew_asset-9999999 due to automatic MID suffix'
+                'customerKey should be testNew_asset-9999999 due to --autoMidSuffix'
             );
 
             // insert
@@ -262,14 +317,14 @@ describe('type: asset', () => {
 
             assert.equal(
                 testUtils.getAPIHistoryLength(),
-                10,
+                5,
                 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
             );
             return;
         });
 
-        it('Should create an assetwith mis-matching memberId, --noMidSuffix and --keySuffix', async () => {
-            handler.setOptions({ keySuffix: '_DEV', noMidSuffix: true });
+        it('Should create an assetwith mis-matching memberId and --keySuffix', async () => {
+            handler.setOptions({ keySuffix: '_DEV' });
             // WHEN
             const deployResult = await handler.deploy(
                 'testInstance/testBU',
@@ -291,19 +346,18 @@ describe('type: asset', () => {
             assert.equal(
                 upsertCallout?.customerKey,
                 'testNew_asset_DEV',
-                'customerKey should be testNew_asset_DEV due to noMidSuffix and keySuffix'
+                'customerKey should be testNew_asset_DEV due to --keySuffix'
             );
 
             assert.equal(
                 testUtils.getAPIHistoryLength(),
-                10,
+                5,
                 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
             );
             return;
         });
 
-        it('Should create an assetwith mis-matching memberId, --noMidSuffix', async () => {
-            handler.setOptions({ noMidSuffix: true });
+        it('Should create an assetwith mis-matching memberId', async () => {
             // WHEN
             const deployResult = await handler.deploy(
                 'testInstance/testBU',
@@ -325,12 +379,12 @@ describe('type: asset', () => {
             assert.equal(
                 upsertCallout?.customerKey,
                 'testNew_asset',
-                'customerKey should be testNew_asset due to noMidSuffix'
+                'customerKey should be testNew_asset'
             );
 
             assert.equal(
                 testUtils.getAPIHistoryLength(),
-                10,
+                5,
                 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
             );
             return;
@@ -342,7 +396,7 @@ describe('type: asset', () => {
             // download first before we test buildTemplate
             await handler.retrieve('testInstance/testBU', ['asset']);
 
-            const expectedApiCallsRetrieve = 15;
+            const expectedApiCallsRetrieve = 21;
             assert.equal(
                 testUtils.getAPIHistoryLength(),
                 expectedApiCallsRetrieve,
@@ -353,16 +407,18 @@ describe('type: asset', () => {
             const result = await handler.buildTemplate(
                 'testInstance/testBU',
                 'asset',
-                ['testExisting_asset_templatebasedemail'],
+                ['testExisting_asset_templatebasedemail', 'testExisting_asset_htmlblock'],
                 'testSourceMarket'
             );
             // WHEN
             assert.equal(process.exitCode, 0, 'buildTemplate should not have thrown an error');
             assert.equal(
                 result.asset ? Object.keys(result.asset).length : 0,
-                1,
-                'only one asset expected'
+                2,
+                'unexpected number of assets templated'
             );
+
+            // testExisting_asset_templatebasedemail
             assert.deepEqual(
                 await getActualTemplateJson(
                     'testExisting_asset_templatebasedemail',
@@ -372,7 +428,6 @@ describe('type: asset', () => {
                 await testUtils.getExpectedJson('9999999', 'asset', 'template-templatebasedemail'),
                 'returned template JSON of buildTemplate was not equal expected'
             );
-
             expect(
                 await getActualTemplateFile(
                     'testExisting_asset_templatebasedemail',
@@ -405,15 +460,21 @@ describe('type: asset', () => {
                     'amp'
                 )
             );
-            // THEN
-            await handler.buildDefinition(
+
+            const definitions = await handler.buildDefinition(
                 'testInstance/testBU',
                 'asset',
-                ['testExisting_asset_templatebasedemail'],
+                ['testExisting_asset_templatebasedemail', 'testExisting_asset_htmlblock'],
                 'testTargetMarket'
             );
             assert.equal(process.exitCode, 0, 'buildDefinition should not have thrown an error');
+            assert.equal(
+                definitions.asset ? Object.keys(definitions.asset).length : 0,
+                2,
+                'unexpected number of assets templated'
+            );
 
+            // testTemplated_asset_templatebasedemail
             assert.deepEqual(
                 await getActualDeployJson(
                     'testTemplated_asset_templatebasedemail',
@@ -456,6 +517,18 @@ describe('type: asset', () => {
                 )
             );
 
+            // testTemplated_asset_htmlblock
+            assert.deepEqual(
+                await getActualDeployJson('testTemplated_asset_htmlblock', 'asset', 'block'),
+                await testUtils.getExpectedJson('9999999', 'asset', 'build-asset_htmlblock'),
+                'returned deployment JSON was not equal expected'
+            );
+            expect(
+                await getActualDeployFile('testTemplated_asset_htmlblock', 'asset', 'block', 'html')
+            ).to.equal(
+                await testUtils.getExpectedFile('9999999', 'asset', 'build-asset_htmlblock', 'html')
+            );
+
             assert.equal(
                 testUtils.getAPIHistoryLength() - expectedApiCallsRetrieve,
                 0,
@@ -463,6 +536,114 @@ describe('type: asset', () => {
             );
             return;
         });
+
+        it('Should create a asset template via buildTemplate with --dependencies', async () => {
+            // download first before we test buildTemplate
+            await handler.retrieve('testInstance/testBU', ['asset']);
+
+            const expectedApiCallsRetrieve = 21;
+            assert.equal(
+                testUtils.getAPIHistoryLength(),
+                expectedApiCallsRetrieve,
+                'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
+            );
+            handler.setOptions({ dependencies: true, skipInteraction: true });
+
+            // GIVEN there is a template
+            const templatedItems = await handler.buildTemplate(
+                'testInstance/testBU',
+                'asset',
+                ['testExisting_asset_templatebasedemail'],
+                'testSourceMarket'
+            );
+            // WHEN
+            assert.equal(process.exitCode, 0, 'buildTemplate should not have thrown an error');
+            assert.equal(
+                templatedItems.asset ? templatedItems.asset.length : 0,
+                5,
+                'Unexpted number of assets templated'
+            );
+            assert.deepEqual(
+                templatedItems.asset.map((item) => item.customerKey),
+                [
+                    '{{{prefix}}}asset_templatebasedemail',
+                    '{{{prefix}}}asset_template',
+                    '{{{prefix}}}asset_htmlblock',
+                    '{{{prefix}}}htmlblock1',
+                    '{{{prefix}}}htmlblock2',
+                ],
+                'expected specific assets to be templated'
+            );
+
+            // testExisting_asset_templatebasedemail
+            assert.deepEqual(
+                await getActualTemplateJson(
+                    'testExisting_asset_templatebasedemail',
+                    'asset',
+                    'message'
+                ),
+                await testUtils.getExpectedJson('9999999', 'asset', 'template-templatebasedemail'),
+                'returned template JSON of buildTemplate was not equal expected'
+            );
+
+            expect(
+                await getActualTemplateFile(
+                    'testExisting_asset_templatebasedemail',
+                    'asset',
+                    'message',
+                    'html',
+                    'views.html.content'
+                )
+            ).to.equal(
+                await testUtils.getExpectedFile(
+                    '9999999',
+                    'asset',
+                    'template-templatebasedemail-html',
+                    'html'
+                )
+            );
+            expect(
+                await getActualTemplateFile(
+                    'testExisting_asset_templatebasedemail',
+                    'asset',
+                    'message',
+                    'amp',
+                    'views.preheader.content'
+                )
+            ).to.equal(
+                await testUtils.getExpectedFile(
+                    '9999999',
+                    'asset',
+                    'template-templatebasedemail-preheader',
+                    'amp'
+                )
+            );
+
+            // testExisting_asset_template
+            assert.deepEqual(
+                await getActualTemplateJson('testExisting_asset_template', 'asset', 'template'),
+                await testUtils.getExpectedJson('9999999', 'asset', 'template-emailTemplate'),
+                'returned template JSON of buildTemplate was not equal expected'
+            );
+
+            // testExisting_asset_htmlblock
+            assert.deepEqual(
+                await getActualTemplateJson('testExisting_asset_htmlblock', 'asset', 'block'),
+                await testUtils.getExpectedJson(
+                    '9999999',
+                    'asset',
+                    'template-testExisting_asset_htmlblock'
+                ),
+                'returned template JSON of buildTemplate was not equal expected'
+            );
+
+            assert.equal(
+                testUtils.getAPIHistoryLength() - expectedApiCallsRetrieve,
+                4,
+                'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
+            );
+            return;
+        });
     });
 
     describe('Delete ================', () => {
@@ -509,7 +690,11 @@ describe('type: asset', () => {
 
         it('Should resolve the id of the item AND find the asset locally', async () => {
             // prep test by retrieving the file
-            await handler.retrieve('testInstance/testBU', ['asset-block'], ['mcdev-issue-1157']);
+            await handler.retrieve(
+                'testInstance/testBU',
+                ['asset-block'],
+                ['testExisting_asset_htmlblock']
+            );
             // WHEN
             const resolveIdJson = await handler.resolveId(
                 'testInstance/testBU',
@@ -558,15 +743,19 @@ describe('type: asset', () => {
             // retrieve result
             assert.deepEqual(
                 replace['testInstance/testBU'].asset,
-                ['testExisting_asset_message'],
+                [
+                    'testExisting_asset_htmlblock',
+                    'testExisting_htmlblock1',
+                    'testExisting_asset_message',
+                ],
                 'should have found the right assets that need updating'
             );
             // get results from cache
             const result = cache.getCache();
             assert.equal(
                 result.asset ? Object.keys(result.asset).length : 0,
-                5,
-                'only 5 assets expected'
+                8,
+                'Unexpected number of assets in cache'
             );
             // check if conversions happened
             expect(
@@ -620,7 +809,7 @@ describe('type: asset', () => {
 
             assert.equal(
                 testUtils.getAPIHistoryLength(),
-                26,
+                23,
                 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
             );
             return;
@@ -649,8 +838,8 @@ describe('type: asset', () => {
             const result = cache.getCache();
             assert.equal(
                 result.asset ? Object.keys(result.asset).length : 0,
-                5,
-                'only 5 assets expected'
+                8,
+                'Unexpected number of assets in cache'
             );
             // check if conversions happened
             expect(
@@ -704,7 +893,7 @@ describe('type: asset', () => {
 
             assert.equal(
                 testUtils.getAPIHistoryLength(),
-                26,
+                23,
                 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
             );
             return;
@@ -726,15 +915,19 @@ describe('type: asset', () => {
             // retrieve result
             assert.deepEqual(
                 replace['testInstance/testBU'].asset,
-                ['testExisting_asset_message'],
+                [
+                    'testExisting_asset_htmlblock',
+                    'testExisting_htmlblock1',
+                    'testExisting_asset_message',
+                ],
                 'should have found the right assets that need updating'
             );
             // get results from cache
             const result = cache.getCache();
             assert.equal(
                 result.asset ? Object.keys(result.asset).length : 0,
-                5,
-                'only 5 assets expected'
+                8,
+                'Unexpected number of assets in cache'
             );
             // check if conversions happened
             expect(
@@ -788,7 +981,7 @@ describe('type: asset', () => {
 
             assert.equal(
                 testUtils.getAPIHistoryLength(),
-                26,
+                23,
                 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
             );
             return;