Skip to content

Commit

Permalink
Merge pull request #85 from reportportal/develop
Browse files Browse the repository at this point in the history
Release 5.0.2
  • Loading branch information
AmsterGet authored Jul 20, 2023
2 parents fb1f332 + d448632 commit aa07ed0
Show file tree
Hide file tree
Showing 22 changed files with 2,657 additions and 2,291 deletions.
11 changes: 8 additions & 3 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"extends": "airbnb-base",
"plugins": ["import", "prettier"],
"extends": ["airbnb-base", "plugin:import/recommended", "prettier"],
"globals": {
"expectAsync": true
},
Expand All @@ -8,8 +9,10 @@
"es6": true,
"jasmine": true
},
"root": true,
"rules": {
"indent": ["error", 4],
"prettier/prettier": "error",
"indent": ["error", 2],
"max-len": ["error", 120],
"valid-jsdoc": ["error", { "requireReturn": false }],
"consistent-return": 0,
Expand Down Expand Up @@ -39,6 +42,8 @@
"implicit-arrow-linebreak": "off",
"prefer-object-spread": "off",
"import/no-useless-path-segments": "off",
"import/extensions": "off"
"import/extensions": "off",
"default-param-last": "off",
"prefer-regex-literals": "off"
}
}
13 changes: 8 additions & 5 deletions .github/workflows/CI-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,25 @@ name: CI-pipeline
on:
push:
branches:
- master
- develop
- '!master'
paths-ignore:
- README.md
- CHANGELOG.md
pull_request:

jobs:
test:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Set up Node.js
uses: actions/setup-node@v1
uses: actions/setup-node@v3
with:
node-version: 18
- name: Clean install of node dependencies
run: npm ci
- name: Install of node dependencies
run: npm install
- name: Run lint
run: npm run lint
- name: Run tests
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Set up Node.js
uses: actions/setup-node@v1
uses: actions/setup-node@v3
with:
node-version: 18
- name: Clean install of node dependencies
run: npm ci
- name: Install of node dependencies
run: npm install
- name: Run lint
run: npm run lint
- name: Run tests
Expand All @@ -41,9 +41,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Set up Node.js
uses: actions/setup-node@v1
uses: actions/setup-node@v3
with:
node-version: 18
registry-url: 'https://registry.npmjs.org'
Expand All @@ -57,7 +57,7 @@ jobs:
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_ACCESS_TOKEN }}
- name: Set up Node.js
uses: actions/setup-node@v1
uses: actions/setup-node@v3
with:
node-version: 18
registry-url: 'https://npm.pkg.github.com'
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ on:
push:
branches:
- master
paths-ignore:
- '.github/**'
- README.md
- CHANGELOG.md

env:
versionFileName: 'VERSION'
Expand Down
9 changes: 9 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"singleQuote": true,
"arrowParens": "always",
"semicolons": "true",
"bracketSpacing": true,
"printWidth": 100,
"tabWidth": 2,
"useTabs": false
}
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
### Fixed
- Send error logs only in case when the test case has been marked as `failed` by the test runner.
### Changed
- `token` configuration option was renamed to `apiKey` to maintain common convention.
- `@reportportal/client-javascript` bumped to version `5.0.12`.
- Readme file updated.

## [5.0.1] - 2023-04-18
### Fixed
Expand Down
174 changes: 92 additions & 82 deletions README.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5.0.1
5.0.2-SNAPSHOT
30 changes: 15 additions & 15 deletions lib/constants/itemTypes.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,25 @@
*/

const entityType = {
SUITE: 'suite',
STEP: 'step',
TEST: 'test',
BEFORE_METHOD: 'BEFORE_METHOD',
BEFORE_SUITE: 'BEFORE_SUITE',
AFTER_SUITE: 'AFTER_SUITE',
AFTER_METHOD: 'AFTER_METHOD',
SUITE: 'suite',
STEP: 'step',
TEST: 'test',
BEFORE_METHOD: 'BEFORE_METHOD',
BEFORE_SUITE: 'BEFORE_SUITE',
AFTER_SUITE: 'AFTER_SUITE',
AFTER_METHOD: 'AFTER_METHOD',
};
const hookTypes = {
BEFORE_ALL: 'beforeAll',
BEFORE_EACH: 'beforeEach',
AFTER_ALL: 'afterAll',
AFTER_EACH: 'afterEach',
BEFORE_ALL: 'beforeAll',
BEFORE_EACH: 'beforeEach',
AFTER_ALL: 'afterAll',
AFTER_EACH: 'afterEach',
};
const hookTypesMap = {
[hookTypes.BEFORE_EACH]: entityType.BEFORE_METHOD,
[hookTypes.BEFORE_ALL]: entityType.BEFORE_SUITE,
[hookTypes.AFTER_EACH]: entityType.AFTER_METHOD,
[hookTypes.AFTER_ALL]: entityType.AFTER_SUITE,
[hookTypes.BEFORE_EACH]: entityType.BEFORE_METHOD,
[hookTypes.BEFORE_ALL]: entityType.BEFORE_SUITE,
[hookTypes.AFTER_EACH]: entityType.AFTER_METHOD,
[hookTypes.AFTER_ALL]: entityType.AFTER_SUITE,
};

module.exports = { entityType, hookTypes, hookTypesMap };
12 changes: 6 additions & 6 deletions lib/constants/logLevels.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
*/

module.exports = {
INFO: 'INFO',
ERROR: 'ERROR',
DEBUG: 'DEBUG',
TRACE: 'TRACE',
FATAL: 'FATAL',
WARN: 'WARN',
INFO: 'INFO',
ERROR: 'ERROR',
DEBUG: 'DEBUG',
TRACE: 'TRACE',
FATAL: 'FATAL',
WARN: 'WARN',
};
6 changes: 3 additions & 3 deletions lib/constants/testStatuses.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
*/

const JasmineStatuses = {
PENDING: 'pending',
DISABLED: 'disabled',
EXCLUDED: 'excluded',
PENDING: 'pending',
DISABLED: 'disabled',
EXCLUDED: 'excluded',
};

module.exports = { JasmineStatuses };
Loading

0 comments on commit aa07ed0

Please sign in to comment.