Skip to content
This repository has been archived by the owner on Nov 27, 2023. It is now read-only.

Commit

Permalink
feat: yarn to pnpm (#335)
Browse files Browse the repository at this point in the history
* feat: yarn to pnpm
  • Loading branch information
FelixZilber committed Aug 13, 2023
1 parent 6e31def commit f3e2863
Show file tree
Hide file tree
Showing 7 changed files with 8,066 additions and 8,062 deletions.
8 changes: 4 additions & 4 deletions .github/actions/e2e/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ runs:
steps:
- name: Install packages
shell: bash
run: yarn install
run: pnpm install

- name: Start selenoid container
shell: bash
run: yarn selenoid:start
run: pnpm selenoid:start

- name: Run server
shell: bash
run: yarn start:sampleApp &
run: pnpm start:sampleApp &

- name: Run tests
shell: bash
run: yarn test
run: pnpm test
5 changes: 5 additions & 0 deletions .github/workflows/ci-pr-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@ jobs:
with:
node-version: 16.20.0

- name: Install pnpm
uses: pnpm/action-setup@v2
with:
version: 8.6.10

- name: Execute e2e with Selenoid
uses: ./.github/actions/e2e

Expand Down
9 changes: 7 additions & 2 deletions .github/workflows/publish-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@ jobs:
with:
node-version: 16

- name: Install pnpm
uses: pnpm/action-setup@v2
with:
version: 8.6.10

- name: Execute e2e with Selenoid
uses: ./.github/actions/e2e

Expand All @@ -47,13 +52,13 @@ jobs:
token: ${{ secrets.WDIO_TOKEN }}

- name: Install packages
run: yarn install
run: pnpm install

- name: run standard version
run: |
git config user.name ${{ secrets.USERNAME }}
git config user.email "${{ secrets.MAIL }}"
yarn release
pnpm release
- name: push changes
run: git push --follow-tags origin master
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ npm i -D wdio-allure-ts typescript start-server-and-test chai http-server
### Setting last Chromedriver version to .env file

```
yarn setChromeDriverVersion
pnpm setChromeDriverVersion
```

### Add example test
Expand Down Expand Up @@ -83,13 +83,13 @@ describeCommon('Test Example', () => {

#### Install and run tests

`yarn` install all dependencies
`pnpm` install all dependencies

`yarn start:sampleApp` spin up the sample app page for testing
`pnpm start:sampleApp` spin up the sample app page for testing

`yarn test` executes all tests
`pnpm test` executes all tests

`yarn spec <spec name>` executes specific spec file
`pnpm spec <spec name>` executes specific spec file

### Environment variables

Expand Down
11 changes: 7 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
{
"name": "wdio-allure-ts",
"version": "7.0.0",
"engines": {
"pnpm": "8.6.10",
"node": ">=16.20.0"
},
"description": "UI E2E testing util",
"license": "MIT",
"author": "Cloudinary <info@cloudinary.com>",
Expand Down Expand Up @@ -30,19 +34,19 @@
"scripts": {
"lint": "eslint './src/**/*.ts'",
"prettier": "prettier --write 'src/**/*.ts'; prettier --write 'src/test/**/*.ts'",
"prepack": "yarn lint && tsc && cp -R src/helpers/ lib/helpers && cp -R src/scripts/ lib/scripts",
"prepack": "pnpm lint && tsc && cp -R src/helpers/ lib/helpers && cp -R src/scripts/ lib/scripts",
"setChromeDriverVersion": "node src/scripts/SetDriverVersionToDotEnv.js",
"test": "wdio src/test/wdio.conf.ts --suite regression",
"spec": "wdio src/test/wdio.conf.ts --spec",
"pretest": "yarn lint",
"pretest": "pnpm lint",
"selenoid:start": "docker pull selenoid/chrome && docker-compose build && docker-compose up -d",
"selenoid:down": "docker-compose down",
"start:sampleApp": "ws --spa src/test/sampleApp/index.html",
"release": "standard-version",
"report": "allure generate --clean && allure open",
"login-okta": "okta-awscli --profile default --okta-profile default",
"login-aws-codeartifact": "aws codeartifact login --tool npm --repository cld-npm-store --domain cloudinary --domain-owner 232482882421 --region us-east-1",
"login-pm": "yarn login-okta && yarn login-aws-codeartifact"
"login-pm": "pnpm login-okta && pnpm login-aws-codeartifact"
},
"resolutions": {
"minimist": "^1.2.6",
Expand Down Expand Up @@ -93,7 +97,6 @@
"eslint-plugin-no-floating-promise": "^1.0.2",
"eslint-plugin-prettier": "^3.3.0",
"eslint-plugin-wdio": "^6.6.0",
"husky": "^4.2.3",
"lint-staged": "^12.3.7",
"local-web-server": "^5.2.0",
"prettier": "2.0.5",
Expand Down
Loading

0 comments on commit f3e2863

Please sign in to comment.