Skip to content

Commit

Permalink
Merge branch 'master' of github.com:6pac/SlickGrid
Browse files Browse the repository at this point in the history
  • Loading branch information
6pac committed Jan 19, 2021
2 parents 33da2fb + 19bf981 commit 214aa40
Show file tree
Hide file tree
Showing 7 changed files with 195 additions and 290 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,19 +24,19 @@ jobs:

steps:
- name: Clone repository
uses: actions/checkout@v1
uses: actions/checkout@v2
with:
fetch-depth: 3

- uses: actions/cache@v1
- uses: actions/cache@v2
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-node-
- name: Set Node.js version
uses: actions/setup-node@v1
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node }}

Expand Down
2 changes: 1 addition & 1 deletion .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{
"label": "Cypress Open GUI",
"type": "shell",
"command": "npm run cypress:open",
"command": "npm run cypress",
"problemMatcher": []
},
{
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ We are now starting to add E2E (end to end) tests in the browser with [Cypress](

We also welcome any new contributions (tests or fixes) and if you wish to add Cypress E2E tests, all you need to do is to clone the repo and then run the following commands
```bash
npm install # install all npm packages
npm run serve # run a local http server on port 8080
npm run cypress:open # open Cypress tool
npm install # install all npm packages
npm run serve # run a local http server on port 8080
npm run cypress # open Cypress tool
```
Once the Cypress UI is open, you can then click on "Run all Specs" to execute all E2E browser tests.
2 changes: 1 addition & 1 deletion cypress/integration/example-plugin-headermenu.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ describe('Example - Header Menu', () => {
cy.get('#myGrid')
.find('.slick-row .slick-cell:nth(2)')
.each($row => {
expect(+$row.text()).to.be.greaterThan(80);
expect(+$row.text()).to.be.greaterThan(60);
});
});

Expand Down
Loading

0 comments on commit 214aa40

Please sign in to comment.