Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
dynabic-billing-team committed May 18, 2024
2 parents a135824 + 3d3e4ac commit e91b1c2
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 15 deletions.
27 changes: 16 additions & 11 deletions JenkinsfileRelease
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ properties([

parameters {
string(name: 'testServerUrl', defaultValue: 'https://api-qa.aspose.cloud', description: 'server url')
booleanParam(name: 'ignorePackageTesting', defaultValue: false, description: 'Skip package testing step (not recommended)')
}

node('words-linux') {
Expand Down Expand Up @@ -53,20 +54,24 @@ node('words-linux') {
}
}

stage('package tests'){
try {
sh "npm run test-jenkins"
} finally {
junit 'reports/**.xml'
}
stage('package tests'){
if (!ignorePackageTesting) {
try {
sh "npm run test-jenkins"
} finally {
junit 'reports/**.xml'
}
}
}

stage('bdd package tests'){
try {
sh "npm run cucumber"
} finally {
cucumber 'reports/**.json'
}
if (!ignorePackageTesting) {
try {
sh "npm run cucumber"
} finally {
cucumber 'reports/**.json'
}
}
}
}
}
Expand Down
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,15 @@ 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 24.5

- Added the support of multistorage operations. Saving a file as a result of an operation can be performed in a specific storage, when, used file path in the next format '@storage:path/to/file.doc'.


## Enhancements in Version 24.4

- Added the 'MergeWithNext' method to merge a section with the next one.
- Added the 'LockAspectRatio' propperty for DrawingObjectInsert and DrawingObjectUpdate methods.


## Enhancements in Version 24.3
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "asposewordscloud",
"version": "24.4.0",
"version": "24.5.0",
"description": "Aspose.Words Cloud SDK for Node.js",
"homepage": "https://products.aspose.cloud/words/cloud",
"author": {
Expand Down
2 changes: 1 addition & 1 deletion src/internal/requestHelper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ async function invokeApiMethodInternal(requestOptions: request.OptionsWithUri, c
requestOptions.timeout = 1000 * confguration.timeout;

requestOptions.headers["x-aspose-client"] = "nodejs sdk";
requestOptions.headers["x-aspose-client-version"] = "24.4";
requestOptions.headers["x-aspose-client-version"] = "24.5";
requestOptions.encoding = null;

requestOptions.uri = encodeURI(requestOptions.uri.toString());
Expand Down
5 changes: 3 additions & 2 deletions test/mailMerge/executeMailMergeTests.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@ describe("executeMailMerge", () => {
const requestData = fs.createReadStream(BaseTest.localBaseTestDataFolder + mailMergeFolder + "/" + localDataFile);
const request = new model.ExecuteMailMergeOnlineRequest({
template: requestTemplate,
data: requestData
data: requestData,
withRegions: true
});

// Act
Expand Down Expand Up @@ -79,7 +80,7 @@ describe("executeMailMerge", () => {
name: remoteFileName,
data: localDataFile,
folder: remoteDataFolder,
withRegions: false,
withRegions: true,
destFileName: BaseTest.remoteBaseTestOutFolder + "/" + remoteFileName
});

Expand Down

0 comments on commit e91b1c2

Please sign in to comment.