replaincg 2 slashes

Author: ignatandrei

src/AngWorkspace/projects/blockly-swagger/src/lib/BlocklyReturnSwagger.ts

@@ -610,6 +610,9 @@ export class BlocklyReturnSwagger {
 
         code +='};\n';
         //  console.log("basepath",self.basePath);
+        if(self.basePath.length>0 && self.basePath.endsWith("/") && key.startsWith("/")){
+          key=key.substring(1);
+        }
         var partUrl= self.basePath  + key;
         if(partUrl.startsWith("//")){
           partUrl=partUrl.replace("//","/");

src/blockly10/src/BlocklyReusable/BlocklyReturnSwagger.ts

@@ -726,7 +726,11 @@ export default class BlocklyReturnSwagger {
 
         code +='};\n';
         //  console.log("basepath",self.basePath);
+        if(self.basePath.length>0 && self.basePath.endsWith("/") && key.startsWith("/")){
+          key=key.substring(1);
+        }
         var partUrl= self.basePath  + key;
+        console.log("all data",self.basePath, key, partUrl);
         if(partUrl.startsWith("//")){
           partUrl=partUrl.replace("//","/");
         }
@@ -735,7 +739,14 @@ export default class BlocklyReturnSwagger {
         if(rootSite.length>0 && partUrl.startsWith(rootSite)){
           code +='\n rootSite="";//the root site is in url;\n';          
         }
+        
+        if(partUrl.startsWith("/")  && rootSite.endsWith("/")){
+          partUrl=partUrl.substring(1);
+        }
+        console.log('final url', rootSite, partUrl);
+
         code += 'var strUrl =rootSite +"'+ partUrl + '";\n';
+        
         var paramsQuery = parameters.filter((it:any) => it.in === "query");
         if(paramsQuery.length>0){
           code += 'strUrl+="?";\n;';

src/blocklyTest/tests/examplesBlockly/configUrl.ts

@@ -45,7 +45,8 @@ export const testConfig = {
 { name: 'identme', url: 'http://localhost:3000/BlocklyAutomation/automation/loadexample/identme' },
 { name: 'ipify', url: 'http://localhost:3000/BlocklyAutomation/automation/loadexample/ipify' },
 { name: 'ipaddy', url: 'http://localhost:3000/BlocklyAutomation/automation/loadexample/ipaddy' },
-{ name: 'objects', url: 'http://localhost:3000/BlocklyAutomation/automation/loadexample/objects' }
+{ name: 'objects', url: 'http://localhost:3000/BlocklyAutomation/automation/loadexample/objects' },
+{ name: 'wait', url: 'http://localhost:3000/BlocklyAutomation/automation/loadexample/wait' },
   ],
   errorUrls: [
     { name: 'Try Catch Error', url: 'http://localhost:3000/BlocklyAutomation/automation/loadexample/chucktry' },
@@ -66,7 +67,7 @@ export const testConfig = {
 { name: 'reduce', url: 'http://localhost:3000/BlocklyAutomation/automation/loadexample/reduce' },
 { name: 'weatherChart', url: 'http://localhost:3000/BlocklyAutomation/automation/loadexample/weatherChart' },
 { name: 'chart', url: 'http://localhost:3000/BlocklyAutomation/automation/loadexample/chart' },
-{ name: 'wait', url: 'http://localhost:3000/BlocklyAutomation/automation/loadexample/wait' },
+
 { name: 'NetCoreBlockly_DemoImage', url: 'http://localhost:3000/BlocklyAutomation/automation/loadexample/NetCoreBlockly_DemoImage' },
 { name: 'NetCoreBlockly_ConvertCSV', url: 'http://localhost:3000/BlocklyAutomation/automation/loadexample/NetCoreBlockly_ConvertCSV' },
 { name: 'NetCoreBlockly_SaveCSV', url: 'http://localhost:3000/BlocklyAutomation/automation/loadexample/NetCoreBlockly_SaveCSV' },

src/blocklyTest/tests/examplesBlockly/successful-execution.spec.ts

@@ -10,7 +10,7 @@ import { test, expect } from '@playwright/test';
 test.describe('API Tests', () => {
   testConfig.successUrls.forEach(({ name, url }) => {
     test(`${name} - Success Flow`, async ({ page }) => {
-    
+     test.setTimeout(60_000);
       // 1. Navigate to Chuck Norris API example and verify page loads successfully
     await page.goto(url);
     await expect(page.getByText('Visual API')).toBeVisible();
@@ -25,6 +25,8 @@ test.describe('API Tests', () => {
     // 4. Click Execute button and verify successful API call with Chuck Norris joke output and no errors
     await page.getByRole('button', { name: 'Execute!' }).click();
 
+        await new Promise(f => setTimeout(f, 25 * 1000));
+
     // Verify output contains expected debug messages and Chuck Norris joke
     await expect(page.getByText('debug mode:start running code !')).toBeVisible();
     await expect(page.getByText('finish running code!')).toBeVisible();

src/react_new_app/my-app/src/BlocklyReusable/BlocklyReturnSwagger.ts

@@ -721,6 +721,9 @@ export default class BlocklyReturnSwagger {
 
         code +='};\n';
         //  console.log("basepath",self.basePath);
+          if(self.basePath.length>0 && self.basePath.endsWith("/") && key.startsWith("/")){
+          key=key.substring(1);
+        }
         var partUrl= self.basePath  + key;
         if(partUrl.startsWith("//")){
           partUrl=partUrl.replace("//","/");