Skip to content

Commit

Permalink
Merge pull request #158 from reportportal/develop
Browse files Browse the repository at this point in the history
Release 5.0.10
  • Loading branch information
AmsterGet authored Apr 30, 2023
2 parents 2daa01e + 391b1b2 commit e1b423b
Show file tree
Hide file tree
Showing 8 changed files with 304 additions and 311 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/CI-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node: [16, 18]
node: [10, 12, 14, 16, 18]
steps:
- name: Checkout repository
uses: actions/checkout@v3
Expand All @@ -41,8 +41,8 @@ jobs:
with:
node-version: ${{ matrix.node }}

- name: Clean install of node dependencies
run: npm ci
- name: Install of node dependencies
run: npm install

- name: Build the source code
run: npm run build
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
### Fixed
- Node.js old versions support (client still supports Node.js >=10).

## [5.0.9] - 2023-04-29
### Changed
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5.0.9
5.0.10-SNAPSHOT
590 changes: 287 additions & 303 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"axios": "^0.27.2",
"axios-retry": "^3.4.0",
"glob": "^7.2.3",
"ini": "^4.0.0",
"ini": "^2.0.0",
"uniqid": "^5.4.0",
"uuid": "^9.0.0"
},
Expand Down
2 changes: 1 addition & 1 deletion spec/client-id.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,6 @@ describe('Client ID test suite', () => {
const clientId = await getClientId();
const content = await readFile(clientIdFile, 'utf-8');
expect(content).toMatch(new RegExp(`(?:^|\n)client\\.id\\s*=\\s*${clientId}\\s*(?:$|\n)`));
expect(content).toMatch(/(?:^|\n)test\.property\s*=\s*555(?:$|\n)/);
expect(content).toMatch(/(?:^|\n)test\.property\s*=\s*555\s*(?:$|\n)/);
});
});
5 changes: 4 additions & 1 deletion statistics/constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@ const RP_FOLDER = '.rp';
const RP_PROPERTIES_FILE = 'rp.properties';
const RP_FOLDER_PATH = path.join(os.homedir(), RP_FOLDER);
const RP_PROPERTIES_FILE_PATH = path.join(RP_FOLDER_PATH, RP_PROPERTIES_FILE);
const CLIENT_INFO = atob('Ry1XUDU3UlNHOFhMOmVFazhPMGJ0UXZ5MmI2VXVRT19TOFE=');
const CLIENT_INFO = Buffer.from(
'Ry1XUDU3UlNHOFhMOmVFazhPMGJ0UXZ5MmI2VXVRT19TOFE=',
'base64',
).toString('binary');
const [MEASUREMENT_ID, API_KEY] = CLIENT_INFO.split(':');
const EVENT_NAME = 'start_launch';

Expand Down
6 changes: 5 additions & 1 deletion statistics/statistics.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,11 @@ class Statistics {
) {
params.agent_name = agentParams.name;
}
if (agentParams && Object.hasOwn(agentParams, 'version') && agentParams.version) {
if (
agentParams &&
Object.prototype.hasOwnProperty.call(agentParams, 'version') &&
agentParams.version
) {
params.agent_version = agentParams.version;
}
return params;
Expand Down

0 comments on commit e1b423b

Please sign in to comment.