Merge remote-tracking branch 'origin/master' into release

Author: dynabic-billing-team

README.md

@@ -16,6 +16,10 @@ Feel free to explore the [Developer's Guide](https://docs.aspose.cloud/display/w
 - Add & remove watermarks and protection.
 - Read & write access to Document Object Model.
 
+## Enhancements in Version 21.11
+
+
+
 ## Enhancements in Version 21.10
 
 - Removed 'GraphicsQualityOptions' image save option as it no longer supported.

bdd/features/conversion/saveAs.feature

@@ -32,7 +32,6 @@ Scenario Outline: Convert document with specified encoding form storage and save
 	And I have specified encoding <LoadEncoding>
 	When I execute conversion from storage (POST SaveAs)
 	Then document <OutPath> is existed on storage in <SubFolder> folder	
-	And symbols are encoded properly
 
 	Examples: 
 	| DocName                  | DestFormat | OutPath                         | LoadEncoding | SubFolder 						|

bdd/steps/common/storageSteps.ts

@@ -27,21 +27,18 @@ import { Given, Then } from "cucumber";
 import * as BaseTest from "../../../test/baseTest";
 import { DeleteFileRequest, DownloadFileRequest } from "../../../src/api";
 
-Given(/^I have uploaded document with name (.*) and subfolder is (.*) to storage$/, function (documentName, folder, callback) {
+Given(/^I have uploaded document with name (.*) and subfolder is (.*) to storage$/, {timeout: 60000}, async function (documentName, folder) {
 
     const wordsApi = BaseTest.initializeWordsApi();
 
     const remotePath = BaseTest.remoteBaseFolder + folder;
     const localPath = BaseTest.localBaseTestDataFolder + folder + documentName;
 
-    wordsApi.uploadFileToStorage(remotePath + documentName, localPath)
-        .then((result) => {
-            expect(result.response.statusMessage).to.equal("OK");
-            callback();
-        });
+    const result = await wordsApi.uploadFileToStorage(remotePath + documentName, localPath);
+    expect(result.response.statusMessage).to.equal("OK");
 });
 
-Given(/^There is no file (.*) on storage in (.*) folder$/, function (documentName, folder, callback) {
+Given(/^There is no file (.*) on storage in (.*) folder$/, {timeout: 60000}, async function (documentName, folder) {
 
     const wordsApi = BaseTest.initializeWordsApi();
 
@@ -53,14 +50,11 @@ Given(/^There is no file (.*) on storage in (.*) folder$/, function (documentNam
     const request = new DeleteFileRequest();
     request.path = remotePath;
 
-    wordsApi.deleteFile(request)
-    .then((result) => {
-        expect(result.statusMessage).to.equal("OK");
-        callback();
-    });
+    const result = await wordsApi.deleteFile(request);
+    expect(result.statusMessage).to.equal("OK");
 });
 
-Then(/^document (.*) is existed on storage in (.*) folder$/, function (documentName, folder, callback) {
+Then(/^document (.*) is existed on storage in (.*) folder$/, {timeout: 60000}, async function (documentName, folder) {
 
     const wordsApi = BaseTest.initializeWordsApi();
 
@@ -73,9 +67,6 @@ Then(/^document (.*) is existed on storage in (.*) folder$/, function (documentN
     const request =  new DownloadFileRequest();
     request.path = remotePath;
 
-    wordsApi.downloadFile(request).
-    then((result) => {
-        expect(result.response.statusMessage).to.equal("OK");
-        callback();
-    });
+    const result = await wordsApi.downloadFile(request);
+    expect(result.response.statusMessage).to.equal("OK");
 });

bdd/steps/conversions/getAlternateDocumentSteps.ts

@@ -26,12 +26,11 @@ import { When } from "cucumber";
 import { GetDocumentWithFormatRequest } from "../../../src/model/model";
 import * as BaseTest from "../../../test/baseTest";
 
-When(/^I execute conversion from storage \(GET document with format\)$/, function() {
+When(/^I execute conversion from storage \(GET document with format\)$/, {timeout: 60000}, async function() {
     const wordsApi = BaseTest.initializeWordsApi();
     const request = new GetDocumentWithFormatRequest(this.request);
 
-    return wordsApi.getDocumentWithFormat(request)
-        .then((result) => {                        
-            this.response = result;
-        });
+    const result =  await wordsApi.getDocumentWithFormat(request);
+    this.response = result;
+    return result;
 });

bdd/steps/conversions/putConvertSteps.ts

@@ -27,17 +27,16 @@ import * as fs from "fs";
 import { ConvertDocumentRequest } from "../../../src/model/model";
 import * as BaseTest from "../../../test/baseTest";
 
-Given(/^I have specified document (.*) to send it in request body$/, function(documentName) {
+Given(/^I have specified document (.*) to send it in request body$/, {timeout: 60000}, function(documentName) {
     const localPath = BaseTest.localBaseTestDataFolder + "DocumentActions/ConvertDocument/" + documentName;
     this.request.document = fs.readFileSync(localPath);    
 });
 
-When(/^I execute conversion \(PUT convert\)$/, function() {
+When(/^I execute conversion \(PUT convert\)$/, async function() {
     const wordsApi = BaseTest.initializeWordsApi();
     const request = new ConvertDocumentRequest(this.request);
 
-    return wordsApi.convertDocument(request)
-        .then((result) => {                        
-            this.response = result;
-        });
+    const result = await wordsApi.convertDocument(request);
+    this.response = result;
+    return result;
 });

bdd/steps/conversions/saveAsSteps.ts

@@ -39,25 +39,25 @@ Given(/^I have specified destFileName (.*)$/, function(destFileName) {
     this.request.saveOptionsData.fileName = destFileName;
 });
 
-When(/^I execute conversion from storage \(POST SaveAs\)$/, function() {
+When(/^I execute conversion from storage \(POST SaveAs\)$/, {timeout: 60000}, async function() {
     const wordsApi = BaseTest.initializeWordsApi();
     const request = new SaveAsRequest(this.request);
 
-    return wordsApi.saveAs(request)
-        .then((result) => {
-            this.response = result;            
-        });
+    const result = await wordsApi.saveAs(request)
+    this.response = result; 
+
+    return result;
 });
 
-Then(/^symbols are encoded properly$/, function() {    
+Then(/^symbols of document (.*) in (.*) are encoded properly$/, {timeout: 60000}, async function(_documentName, _folder) {  
+
     const wordsApi = BaseTest.initializeWordsApi();
     const request = new GetRunsRequest({
         folder: BaseTest.remoteBaseFolder + "DocumentActions/ConvertDocument/out/saveas",
         name: "TableDocumentDoc.doc",
         paragraphPath: null
     });
 
-    wordsApi.getRuns(request).then((result) => {
-        expect(result.body.runs.list[0].text).to.equal("строка");        
-    });
+    const result = await wordsApi.getRuns(request);
+    expect(result.body.runs.list[0].text).to.equal("строка");        
 });

bdd/steps/mailMerge/postExecuteTemplateSteps.ts

@@ -30,7 +30,7 @@ import * as BaseTest from "../../../test/baseTest";
 
 const testFolder = "DocumentActions/MailMerge/";
 
-Given(/^I have specified a template file name (.*) in storage$/, function(templateName, callback) {
+Given(/^I have specified a template file name (.*) in storage$/, {timeout: 60000}, async function(templateName) {
 
     const worsApi = BaseTest.initializeWordsApi();
 
@@ -40,37 +40,31 @@ Given(/^I have specified a template file name (.*) in storage$/, function(templa
     this.request.name = templateName;
     this.request.folder = remotePath.slice(0, -1);
 
-    worsApi.uploadFileToStorage(remotePath + templateName, localPath)
-    .then((result) => {
-        expect(result.response.statusMessage).to.equal("OK");
-        callback();
-    });
+    const result =  await worsApi.uploadFileToStorage(remotePath + templateName, localPath)
+    expect(result.response.statusMessage).to.equal("OK");
 });
 
 Given(/^I have specified a body (.*)$/, function(fileWithBodyContent) {
     this.request.data = fs.readFileSync(BaseTest.localBaseTestDataFolder + testFolder + fileWithBodyContent);
 });
 
-When(/^I execute template$/, function() {
+When(/^I execute template$/, {timeout: 60000}, async function() {
     const wordsApi = BaseTest.initializeWordsApi();
     const request = new ExecuteMailMergeRequest(this.request);
 
-    return wordsApi.executeMailMerge(request)
-        .then((result) => {
-            this.response = result;
-        });
+    const result =  await wordsApi.executeMailMerge(request)
+    this.response = result;
+    return result;
 });
 
-Then(/^image should be rendered$/, function(callback) {
+Then(/^image should be rendered$/, {timeout: 60000}, async function() {
     const wordsApi = BaseTest.initializeWordsApi();
     const request = new GetDocumentDrawingObjectsRequest({
         folder: BaseTest.remoteBaseFolder + "DocumentActions/MailMerge",
         name: "ExecuteTemplateWithImagesResult.doc",
         nodePath: null
     });
 
-    wordsApi.getDocumentDrawingObjects(request).then((result) => {
-        expect(result.body.drawingObjects.list.length).to.greaterThan(0);
-        callback();
-    });
+    const result = await wordsApi.getDocumentDrawingObjects(request);
+    expect(result.body.drawingObjects.list.length).to.greaterThan(0);
 });

bdd/steps/mailMerge/putExecuteMailMergeSteps.ts

@@ -26,12 +26,11 @@ import { When } from "cucumber";
 import { ExecuteMailMergeOnlineRequest } from "../../../src/model/model";
 import * as BaseTest from "../../../test/baseTest";
 
-When(/^I execute mail merge online$/, function() {
+When(/^I execute mail merge online$/, {timeout: 60000}, async function() {
     const wordsApi = BaseTest.initializeWordsApi();
     const request = new ExecuteMailMergeOnlineRequest(this.request);
 
-    return wordsApi.executeMailMergeOnline(request)
-        .then((result) => {                        
-            this.response = result;            
-        });
+    const result = await wordsApi.executeMailMergeOnline(request)
+    this.response = result;
+    return result;
 });

bdd/steps/mailMerge/putExecuteTemplateSteps.ts

@@ -29,16 +29,16 @@ import * as BaseTest from "../../../test/baseTest";
 
 const testFolder = "DocumentActions/MailMerge/";
 
-Given(/^I have specified a template file (.*) in request$/, function(templateName) {
+Given(/^I have specified a template file (.*) in request$/, {timeout: 60000}, function(templateName) {
     this.request.template = fs.readFileSync(BaseTest.localBaseTestDataFolder + testFolder + templateName);
 });
 
-When(/^I execute template online$/, function() {
+When(/^I execute template online$/, async function() {
     const wordsApi = BaseTest.initializeWordsApi();
     const request = new ExecuteMailMergeOnlineRequest(this.request);
 
-    return wordsApi.executeMailMergeOnline(request)
-        .then((result) => {                        
-            this.response = result;            
-        });
+    const result =  await wordsApi.executeMailMergeOnline(request)
+    this.response = result;
+
+    return result;
 });