Merge pull request #664 from SahilChoudhary22/feature/remove-semaphor…

…e-from-swift-snippet Removed semaphore usage from swift snippet, minor workflow fix, swift options cleanup
postmanlabs · Feb 3, 2023 · 3b85e31 · 3b85e31
2 parents 8d76066 + 7312a4a
commit 3b85e31
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 14 deletions.
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -1,6 +1,6 @@
 name: Test
 
-on: push
+on: [push, pull_request]
 
 jobs:
   Unit-Tests:

diff --git a/codegens/swift/lib/swift.js b/codegens/swift/lib/swift.js
@@ -250,11 +250,11 @@ self = module.exports = {
         description: 'Remove white space and additional lines that may affect the server\'s response'
       },
       {
-        name: 'Follow redirects',
-        id: 'followRedirect',
+        name: 'Include boilerplate',
+        id: 'includeBoilerplate',
         type: 'boolean',
-        default: true,
-        description: 'Automatically follow HTTP redirects'
+        default: false,
+        description: 'Include class definition and import statements in snippet'
       }
     ];
   },
@@ -286,15 +286,15 @@ self = module.exports = {
       throw new Error('Swift-Converter: callback is not valid function');
     }
     options = sanitizeOptions(options, self.getOptions());
-    var codeSnippet, indent, trim, timeout, finalUrl, // followRedirect,
+    var indent, trim, timeout, finalUrl,
+      codeSnippet = '',
       bodySnippet = '',
       headerSnippet = '',
       requestBody;
 
     indent = options.indentType === 'Tab' ? '\t' : ' ';
     indent = indent.repeat(options.indentCount);
     timeout = options.requestTimeout;
-    // followRedirect = options.followRedirect;
     trim = options.trimRequestBody;
     finalUrl = getUrlStringfromUrlObject(request.url);
 
@@ -342,9 +342,10 @@ self = module.exports = {
     requestBody = (request.body ? request.body.toJSON() : {});
     bodySnippet = parseBody(requestBody, trim, indent);
 
-    codeSnippet = 'import Foundation\n';
-    codeSnippet += '#if canImport(FoundationNetworking)\nimport FoundationNetworking\n#endif\n\n';
-    codeSnippet += 'var semaphore = DispatchSemaphore (value: 0)\n\n';
+    if (options.includeBoilerplate) {
+      codeSnippet += 'import Foundation\n';
+      codeSnippet += '#if canImport(FoundationNetworking)\nimport FoundationNetworking\n#endif\n\n';
+    }
     if (bodySnippet !== '') {
       codeSnippet += `${bodySnippet}\n\n`;
     }
@@ -375,13 +376,14 @@ self = module.exports = {
     codeSnippet += '\nlet task = URLSession.shared.dataTask(with: request) { data, response, error in \n';
     codeSnippet += `${indent}guard let data = data else {\n`;
     codeSnippet += `${indent.repeat(2)}print(String(describing: error))\n`;
-    codeSnippet += `${indent.repeat(2)}semaphore.signal()\n`;
-    codeSnippet += `${indent.repeat(2)}return\n`;
+    codeSnippet += `${indent.repeat(2)}`;
+    codeSnippet += options.includeBoilerplate ? 'exit(EXIT_SUCCESS)\n' : 'return\n';
     codeSnippet += `${indent}}\n`;
     codeSnippet += `${indent}print(String(data: data, encoding: .utf8)!)\n`;
-    codeSnippet += `${indent}semaphore.signal()\n}\n\n`;
+    codeSnippet += options.includeBoilerplate ? `${indent}exit(EXIT_SUCCESS)\n` : '';
+    codeSnippet += '}\n\n';
     codeSnippet += 'task.resume()\n';
-    codeSnippet += 'semaphore.wait()\n';
+    codeSnippet += options.includeBoilerplate ? 'dispatchMain()\n' : '';
 
     return callback(null, codeSnippet);
   }

diff --git a/codegens/swift/test/newman/newman.test.js b/codegens/swift/test/newman/newman.test.js
@@ -3,6 +3,7 @@ var runNewmanTest = require('../../../../test/codegen/newman/newmanTestUtil').ru
 
 describe('Convert for different types of request', function () {
   var options = {
+      includeBoilerplate: true,
       indentType: 'Space',
       indentCount: 4
     },

diff --git a/codegens/swift/test/unit/convert.test.js b/codegens/swift/test/unit/convert.test.js
@@ -364,6 +364,7 @@ describe('Swift Converter', function () {
       expect(getOptions()[1]).to.have.property('id', 'indentType');
       expect(getOptions()[2]).to.have.property('id', 'requestTimeout');
       expect(getOptions()[3]).to.have.property('id', 'trimRequestBody');
+      expect(getOptions()[4]).to.have.property('id', 'includeBoilerplate');
     });
   });