diff --git a/tests/.eslintrc.js b/.eslintrc.js similarity index 100% rename from tests/.eslintrc.js rename to .eslintrc.js diff --git a/.github/workflows/coding-style.yml b/.github/workflows/coding-style.yml index 964b0c311..fce838618 100644 --- a/.github/workflows/coding-style.yml +++ b/.github/workflows/coding-style.yml @@ -29,3 +29,12 @@ jobs: - run: composer create-project nette/coding-standard temp/coding-standard ^3 --no-progress - run: php temp/coding-standard/ecs check src tests + + + eslint: + name: ESLint + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - run: npm install + - run: npx eslint src/assets/netteForms.js diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index aa386a1e9..4d73a5489 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -58,3 +58,13 @@ jobs: - env: COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: php php-coveralls.phar --verbose --config tests/.coveralls.yml + + + jasmine: + name: JavaScript tests + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + #- run: npm install -g grunt-cli + - run: npm install --prefix tests/netteForms + - run: grunt --gruntfile=tests/netteForms/Gruntfile.js test diff --git a/.gitignore b/.gitignore index de4a392c3..12564f855 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ /vendor /composer.lock +node_modules +package-lock.json diff --git a/package.json b/package.json index d4da5ce0d..497fddca3 100644 --- a/package.json +++ b/package.json @@ -17,5 +17,8 @@ "repository": { "type": "git", "url": "git+https://github.com/nette/forms.git" + }, + "devDependencies": { + "eslint": "^8.52.0" } } diff --git a/tests/netteForms/Gruntfile.js b/tests/netteForms/Gruntfile.js index d2bec6af1..65e2d4140 100644 --- a/tests/netteForms/Gruntfile.js +++ b/tests/netteForms/Gruntfile.js @@ -15,7 +15,7 @@ module.exports = function(grunt) { } }); - grunt.loadNpmTasks('grunt-contrib-jasmine'); + require('load-grunt-tasks')(grunt); grunt.registerTask('test', [ 'jasmine' diff --git a/tests/netteForms/SpecRunner.html b/tests/netteForms/SpecRunner.html index 96ead3a82..ce3225f64 100644 --- a/tests/netteForms/SpecRunner.html +++ b/tests/netteForms/SpecRunner.html @@ -8,7 +8,8 @@ - + + diff --git a/tests/netteForms/package.json b/tests/netteForms/package.json index 3417de3d2..ad243089e 100644 --- a/tests/netteForms/package.json +++ b/tests/netteForms/package.json @@ -1,9 +1,9 @@ { "devDependencies": { - "eslint": "^7.4.0", - "grunt": "^1.2.1", - "grunt-contrib-jasmine": "^2.2.0", - "jasmine": "^3.5.0", - "js-fixtures": "^1.5.3" + "grunt": "^1.6.1", + "grunt-contrib-jasmine": "^4.0.0", + "jasmine": "^5.1.0", + "js-fixtures": "^1.5.3", + "load-grunt-tasks": "^5.1.0" } }