diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml index 87fdb3106..021ef7e38 100644 --- a/.github/workflows/ci-cd.yml +++ b/.github/workflows/ci-cd.yml @@ -122,7 +122,7 @@ jobs: uses: reviewdog/action-rubocop@v2 with: rubocop_version: gemfile - rubocop_extensions: rubocop-performance:gemfile rubocop-rails:gemfile rubocop-rspec:gemfile + rubocop_extensions: rubocop-performance:gemfile rubocop-rails:gemfile rubocop-rspec:gemfile rubocop-capybara:gemfile reporter: github-pr-review # Default is github-pr-check - run: yarn lint:frontend - run: bundle exec bundle-audit check --update diff --git a/.lintstagedrc.js b/.lintstagedrc.js index 16a0d224c..08ddd5c0c 100644 --- a/.lintstagedrc.js +++ b/.lintstagedrc.js @@ -2,9 +2,7 @@ module.exports = { '*.json': ['prettier --write'], '*.md': ['prettier --write --prose-wrap always'], - '*.rake': [ - 'bundle exec rubocop --require rubocop-rspec --autocorrect --enable-pending-cops', - ], + '*.rake': ['bundle exec rubocop --autocorrect'], '*.scss': ['prettier --write'], '*.svg': ['svgo --pretty'], '*.{js,jsx}': [ @@ -12,22 +10,14 @@ module.exports = { 'eslint --fix', 'jest --findRelatedTests --passWithNoTests', ], - './Gemfile': [ - 'bundle exec rubocop --require rubocop-rspec --autocorrect --enable-pending-cops', - ], + './Gemfile': ['bundle exec rubocop --autocorrect'], 'app/**/*.html.erb': ['bundle exec erblint --autocorrect'], 'app/assets/config/manifest.js': [ 'prettier --write', 'eslint --fix -c app/assets/javascripts/.eslintrc.js', ], - 'app/views/**/*.jbuilder': [ - 'bundle exec rubocop --require rubocop-rspec --autocorrect --enable-pending-cops', - ], + 'app/views/**/*.jbuilder': ['bundle exec rubocop --autocorrect'], // 'config/locales/*': () => 'bundle exec i18n-tasks normalize', - 'scripts/{release,stage_release}': [ - 'bundle exec rubocop --require rubocop-rspec --autocorrect --enable-pending-cops', - ], - '{app,spec,config,lib}/**/*.rb': [ - 'bundle exec rubocop --require rubocop-rspec --autocorrect --enable-pending-cops', - ], + 'scripts/{release,stage_release}': ['bundle exec rubocop --autocorrect'], + '{app,spec,config,lib}/**/*.rb': ['bundle exec rubocop --autocorrect'], };