Skip to content

Commit

Permalink
test
Browse files Browse the repository at this point in the history
remove package-lock.json
Migrate to yarn
Add yarn.lock
fix
fix cwd
  • Loading branch information
denysoblohin-okta committed Jun 20, 2022
1 parent 271646c commit d0f341a
Show file tree
Hide file tree
Showing 15 changed files with 3,013 additions and 3,988 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ node_js:
addons:
chrome: stable
install:
- npm install
- yarn install --frozen-lockfile
script:
- echo "Tests not run on travis"
notifications:
Expand Down
8 changes: 4 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@ If you do not see an exact emoji match, use the best matching emoji.

E2E Tests can be run against the Custom Login and Okta-Hosted Login servers

In addition to running npm install in the root of the project (to install the dev dependencies for testing), you will also need to install the dependencies of each sample app. This can be performed via the `npm install` command:
In addition to running yarn install in the root of the project (to install the dev dependencies for testing), you will also need to install the dependencies of each sample app. This can be performed via the `yarn install` command:

```bash
# At project root
npm install
yarn install
```
To test both samples you will need the following configured in your developer org:

Expand Down Expand Up @@ -86,10 +86,10 @@ PASSWORD=mypassword
Then run the E2E tests:

```bash
npm test
yarn test
```

**NOTE:** If you want to execute individual tests such as `npm run test:okta-hosted-login`, you will need to update the environment by running the following node script:
**NOTE:** If you want to execute individual tests such as `yarn test:okta-hosted-login`, you will need to update the environment by running the following node script:

```javascript
node scripts/setup-env.js
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ You can use your Okta user credentials to login to the applications. That's it!
The samples include a page which accesses a protected resource (messages). To start the sample resource server:

```
npm run resource-server
yarn resource-server
```

## Running the tests
Expand Down
2 changes: 1 addition & 1 deletion custom-login/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ cd samples-js-angular/custom-login
Then install dependencies:

```bash
npm install
yarn install
```

Now you need to gather the following information from the Okta Developer Console:
Expand Down
3 changes: 2 additions & 1 deletion custom-login/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"ng": "ng",
"start": "ng serve",
"build": "ng build --prod --deploy-url /custom-login/ --base-href /custom-login/",
"test": "npm run lint && npm run test:custom-login --prefix ../",
"test": "yarn lint && yarn --cwd .. test:custom-login",
"lint": "ng lint"
},
"private": true,
Expand Down Expand Up @@ -47,3 +47,4 @@
"typescript": "~4.1.5"
}
}

2 changes: 1 addition & 1 deletion okta-hosted-login/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ cd samples-js-angular/okta-hosted-login
Then install dependencies:

```bash
npm install
yarn install
```

Now you need to gather the following information from the Okta Developer Console:
Expand Down
2 changes: 1 addition & 1 deletion okta-hosted-login/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"ng": "ng",
"start": "ng serve",
"build": "ng build --prod --deploy-url /okta-hosted-login/ --base-href /okta-hosted-login/",
"test": "npm run lint && npm run test:okta-hosted-login --prefix ../",
"test": "yarn lint && yarn --cwd .. test:okta-hosted-login",
"lint": "ng lint"
},
"private": true,
Expand Down
Loading

0 comments on commit d0f341a

Please sign in to comment.