mcdev 6.0.1 → 6.0.2

package/test/resources/9999999/transactionalSMS/template-expected.amp

@@ -1,4 +1,108 @@
-
+line1
+%%[
+    SET @test = '{{{description}}}'
+]%%
+line2 %%= v(@test) =%% still line2
+line3
 %%[
     SET @key = '{{{secret}}}'
 ]%%
+
+%%[
+    SET @unsubMessages = 'UnsubscribeSMSMessages_DEV'
+    SET @unsubEvents = 'UnsubscribeSMS_DEV'
+    SET @num = concat('+', [MOBILE_NUMBER])
+    SET @rs = RetrieveSalesforceObjects(
+        'Contact',
+        'Id,et4ae5__HasOptedOutOfMobile__c',
+        'MobilePhone',
+        '=',
+        @num
+    )
+    SET @count = rowCount(@rs)
+    VAR @response
+    SET @rx = '^\+((?:9[679]\d8[035789]\d|6[789]\d|5[90]\d|42\d|3[578]\d|2[1-689]\d)|9[0-58]|8[1246]|6[0-6]|5[1-8]|4[013-9]|3[0-469]|2[70]|7|1)'
+    SET @prefix = concat('+', RegExMatch(@num, @rx, 1))
+    IF @count>0 THEN
+        FOR @I = 1 TO @COUNT DO
+            SET @sk = Field(Row(@rs, @i), 'Id')
+            IF Field(Row(@rs, 1), 'et4ae5__HasOptedOutOfMobile__c') == 'false' THEN
+                SET @result = UpdateSingleSalesforceObject('Contact', @sk, 'et4ae5__HasOptedOutOfMobile__c', 'true')
+                IF @result == 0 THEN
+                    InsertData(
+                        @unsubEvents,
+                        'MobileNumber',
+                        @num,
+                        'Message',
+                        [MSG(0).NOUNS],
+                        'ContactId',
+                        @sk,
+                        'Status',
+                        'Error Updating'
+                    )
+                ELSE
+                    InsertData(
+                        @unsubEvents,
+                        'MobileNumber',
+                        @num,
+                        'Message',
+                        [MSG(0).NOUNS],
+                        'ContactId',
+                        @sk,
+                        'Status',
+                        'Successfully Unsubscribed'
+                    )
+                ENDIF
+            ELSE
+                InsertData(
+                    @unsubEvents,
+                    'MobileNumber',
+                    @num,
+                    'Message',
+                    [MSG(0).NOUNS],
+                    'ContactId',
+                    @sk,
+                    'Status',
+                    'Already Unsubscribed'
+                )
+            ENDIF
+        NEXT @i
+        SET @msg = Lookup(
+            @unsubMessages,
+            'Message',
+            'Prefix',
+            @prefix,
+            'Type',
+            'Found'
+        )
+        IF Length(@msg) == 0 THEN
+            SET @response = 'You have unsubscribed and will no longer receive any messages.|'
+        ELSE
+            SET @response = @msg
+        ENDIF
+    ELSE
+        InsertData(
+            @unsubEvents,
+            'MobileNumber',
+            @num,
+            'Message',
+            [MSG(0).NOUNS],
+            'Status',
+            'Not Found'
+        )
+        SET @msg = Lookup(
+            @unsubMessages,
+            'Message',
+            'Prefix',
+            @prefix,
+            'Type',
+            'NotFound'
+        )
+        IF Length(@msg) == 0 THEN
+            SET @response = 'Sorry, we could not find you'
+        ELSE
+            SET @response = @msg
+        ENDIF
+    ENDIF
+]%%
+%%=v(@response)=%%

package/test/type.script.test.js

@@ -20,22 +20,21 @@ describe('type: script', () => {
             const retrieve = await handler.retrieve('testInstance/testBU', ['script']);
             // THEN
             assert.equal(process.exitCode, false, 'retrieve should not have thrown an error');
-
             // retrieve result
             assert.equal(
                 retrieve['testInstance/testBU'].script
                     ? Object.keys(retrieve['testInstance/testBU'].script).length
                     : 0,
-                2,
-                'only 2 scripts expected in retrieve response'
+                5,
+                'only 5 scripts expected in retrieve response'
             );
 
             // get results from cache
             const result = cache.getCache();
             assert.equal(
                 result.script ? Object.keys(result.script).length : 0,
-                2,
-                'only 2 scripts expected'
+                5,
+                'only 5 scripts expected'
             );
             // normal test
             assert.deepEqual(
@@ -49,6 +48,7 @@ describe('type: script', () => {
                 file(testUtils.getExpectedFile('9999999', 'script', 'get', 'ssjs'))
             );
 
+            // test with no script tag
             assert.deepEqual(
                 await testUtils.getActualJson('testExisting_script_noScriptTag', 'script'),
                 await testUtils.getExpectedJson('9999999', 'script', 'get_noScriptTag'),
@@ -63,6 +63,47 @@ describe('type: script', () => {
                 file(testUtils.getActualFile('testExisting_script_noScriptTag', 'script', 'ssjs'))
             ).to.not.exist;
 
+            // test with ampscript
+            assert.deepEqual(
+                await testUtils.getActualJson('testExisting_script_ampscript', 'script'),
+                await testUtils.getExpectedJson('9999999', 'script', 'get_ampscript'),
+                'returned metadata was not equal expected'
+            );
+            expect(
+                file(testUtils.getActualFile('testExisting_script_ampscript', 'script', 'html'))
+            ).to.equal(
+                file(testUtils.getExpectedFile('9999999', 'script', 'get_ampscript', 'html'))
+            );
+            expect(file(testUtils.getActualFile('testExisting_script_ampscript', 'script', 'ssjs')))
+                .to.not.exist;
+
+            // test with mixed code (ampscript inside of ssjs)
+            assert.deepEqual(
+                await testUtils.getActualJson('testExisting_script_ampincluded', 'script'),
+                await testUtils.getExpectedJson('9999999', 'script', 'get_ampincluded'),
+                'returned metadata was not equal expected'
+            );
+            expect(
+                file(testUtils.getActualFile('testExisting_script_ampincluded', 'script', 'html'))
+            ).to.not.exist;
+            expect(
+                file(testUtils.getActualFile('testExisting_script_ampincluded', 'script', 'ssjs'))
+            ).to.equal(
+                file(testUtils.getExpectedFile('9999999', 'script', 'get_ampincluded', 'ssjs'))
+            );
+
+            // test with mixed code (ssjs and ampscript side-by-side)
+            assert.deepEqual(
+                await testUtils.getActualJson('testExisting_script_mixed', 'script'),
+                await testUtils.getExpectedJson('9999999', 'script', 'get_mixed'),
+                'returned metadata was not equal expected'
+            );
+            expect(
+                file(testUtils.getActualFile('testExisting_script_mixed', 'script', 'html'))
+            ).to.equal(file(testUtils.getExpectedFile('9999999', 'script', 'get_mixed', 'html')));
+            expect(file(testUtils.getActualFile('testExisting_script_mixed', 'script', 'ssjs'))).to
+                .not.exist;
+
             assert.equal(
                 testUtils.getAPIHistoryLength(),
                 3,
@@ -122,8 +163,8 @@ describe('type: script', () => {
             const result = cache.getCache();
             assert.equal(
                 result.script ? Object.keys(result.script).length : 0,
-                2,
-                'two scripts in cache expected'
+                5,
+                '5 scripts in cache expected'
             );
             assert.deepEqual(
                 await testUtils.getActualJson('testExisting_script', 'script'),
@@ -162,8 +203,8 @@ describe('type: script', () => {
             const result = cache.getCache();
             assert.equal(
                 result.script ? Object.keys(result.script).length : 0,
-                2,
-                'two scripts in cache expected'
+                5,
+                '5 scripts in cache expected'
             );
 
             expect(file(testUtils.getActualFile('testExisting_script', 'script', 'ssjs'))).to.not
@@ -189,8 +230,8 @@ describe('type: script', () => {
             const result = cache.getCache();
             assert.equal(
                 result.script ? Object.keys(result.script).length : 0,
-                3,
-                'three scripts expected'
+                6,
+                '6 scripts expected'
             );
             // confirm created item
             assert.deepEqual(
@@ -198,15 +239,14 @@ describe('type: script', () => {
                 await testUtils.getExpectedJson('9999999', 'script', 'post'),
                 'returned metadata was not equal expected for insert script'
             );
-            expect(file(testUtils.getActualFile('testNew_script', 'script', 'ssjs'))).to.equal(
-                file(testUtils.getExpectedFile('9999999', 'script', 'post', 'ssjs'))
-            );
             // confirm updated item
             assert.deepEqual(
                 await testUtils.getActualJson('testExisting_script', 'script'),
                 await testUtils.getExpectedJson('9999999', 'script', 'patch'),
                 'returned metadata was not equal expected for insert script'
             );
+            expect(file(testUtils.getActualFile('testExisting_script', 'script', 'html'))).to.not
+                .exist;
             expect(file(testUtils.getActualFile('testExisting_script', 'script', 'ssjs'))).to.equal(
                 file(testUtils.getExpectedFile('9999999', 'script', 'patch', 'ssjs'))
             );

package/test/utils.js

@@ -156,6 +156,9 @@ export function mockSetup(isDeploy) {
         'node_modules/prettier-plugin-sql': fsmock.load(
             path.resolve(__dirname, '../node_modules/prettier-plugin-sql')
         ),
+        'node_modules/beauty-amp-core2': fsmock.load(
+            path.resolve(__dirname, '../node_modules/beauty-amp-core2')
+        ),
         'node_modules/node-sql-parser': fsmock.load(
             path.resolve(__dirname, '../node_modules/node-sql-parser')
         ),