Skip to content

Commit

Permalink
Resolve vulnerabilities + fix tests (#668)
Browse files Browse the repository at this point in the history
* Remove GPR Github action (for now)

* Update test badge

* Remove stale.yml

* Upgrade cypress + fix failing tests

* Upgrade postcss-cli

* Update postcss command

* Remove space

* Add slight delay between scrolling animations

* Update test descriptions

* Remove signed commits/tagging (for now)

* chore(release): 🔖 version 7.0.5

* Update commit message

* Revert "Upgrade cypress + fix failing tests"

This reverts commit b6fbd0f.
  • Loading branch information
jshjohnson authored Oct 21, 2019
1 parent f597bc9 commit ffc32df
Show file tree
Hide file tree
Showing 8 changed files with 610 additions and 594 deletions.
21 changes: 0 additions & 21 deletions .github/stale.yml

This file was deleted.

32 changes: 6 additions & 26 deletions .github/workflows/npmpublish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ jobs:
node-version: 10
# run all tests
- run: |
npm ci
npm run build
npx bundlesize
npm run coverage
npm run test:e2e
npm ci
npm run build
npx bundlesize
npm run coverage
npm run test:e2e
env:
CI: true
CI_REPO_NAME: ${{ github.event.repository.name }}
Expand Down Expand Up @@ -63,24 +63,4 @@ jobs:
HUSKY_SKIP_INSTALL: true
- run: npm publish
env:
NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}

publish-gpr:
needs: build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
with:
fetch-depth: 1
- uses: actions/setup-node@v1
with:
node-version: 10
registry-url: https://npm.pkg.github.com/
scope: "@jshjohnson"
- run: npm ci
env:
CYPRESS_INSTALL_BINARY: 0
HUSKY_SKIP_INSTALL: true
- run: npm publish --access public
env:
NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
6 changes: 2 additions & 4 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
message="chore(release): :bookmark: version %s"
git-tag-version=true
sign-git-tag=true
sign-git-commit=true
message=":bookmark: Version %s"
git-tag-version=true
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Choices.js ![Build Status](https://travis-ci.org/jshjohnson/Choices.svg?branch=master) [![](https://data.jsdelivr.com/v1/package/npm/choices.js/badge?style=rounded)](https://www.jsdelivr.com/package/npm/choices.js) [![npm](https://img.shields.io/npm/v/choices.js.svg)](https://www.npmjs.com/package/choices.js) [![codebeat badge](https://codebeat.co/badges/55120150-5866-42d8-8010-6aaaff5d3fa1)](https://codebeat.co/projects/github-com-jshjohnson-choices-master)
# Choices.js [![Actions Status](https://github.com/jshjohnson/Choices/workflows/Unit%20Tests/badge.svg)](https://github.com/jshjohnson/Choices/actions) [![npm](https://img.shields.io/npm/v/choices.js.svg)](https://www.npmjs.com/package/choices.js) [![codebeat badge](https://codebeat.co/badges/55120150-5866-42d8-8010-6aaaff5d3fa1)](https://codebeat.co/projects/github-com-jshjohnson-choices-master)
A vanilla, lightweight (~22kb gzipped 🎉), configurable select box/text input plugin. Similar to Select2 and Selectize but without the jQuery dependency.

[Demo](https://joshuajohnson.co.uk/Choices/)
Expand Down
6 changes: 4 additions & 2 deletions cypress/integration/select-multiple.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ describe('Choices - select multiple', () => {
});

describe('on click', () => {
it('does not opens choice dropdown', () => {
it('does not open choice dropdown', () => {
cy.get('[data-test-hook=disabled-via-attr]')
.find('.choices')
.click()
Expand Down Expand Up @@ -515,7 +515,7 @@ describe('Choices - select multiple', () => {
});

describe('on click', () => {
it('does not opens choice dropdown', () => {
it('does not open choice dropdown', () => {
cy.get('[data-test-hook=remote-data]')
.find('.choices')
.click()
Expand Down Expand Up @@ -567,6 +567,8 @@ describe('Choices - select multiple', () => {

it('scrolls to next choice on down arrow', () => {
for (let index = 0; index < choicesCount; index++) {
cy.wait(100);

cy.get('[data-test-hook=scrolling-dropdown]')
.find('.choices__list--dropdown .choices__list .is-highlighted')
.should($choice => {
Expand Down
2 changes: 1 addition & 1 deletion cypress/integration/select-one.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,7 @@ describe('Choices - select one', () => {
});

describe('on click', () => {
it('does not opens choice dropdown', () => {
it('does not open choice dropdown', () => {
cy.get('[data-test-hook=remote-data]')
.find('.choices')
.click()
Expand Down
Loading

0 comments on commit ffc32df

Please sign in to comment.