From c137a1780ab376524980d48fa68e59a5578642e2 Mon Sep 17 00:00:00 2001 From: Judah Meek Date: Mon, 13 May 2024 16:52:28 -0500 Subject: [PATCH] possible ci fixes --- .github/workflows/rubocop.yml | 2 +- test/dummy/app/views/layouts/application.html.erb | 1 - test/react/rails/react_rails_ujs_test.rb | 4 ++++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/rubocop.yml b/.github/workflows/rubocop.yml index 08e76dbc3..a6ae7a864 100644 --- a/.github/workflows/rubocop.yml +++ b/.github/workflows/rubocop.yml @@ -27,4 +27,4 @@ jobs: ruby-version: ${{ matrix.ruby }} bundler-cache: true - name: Run rubocop - run: rubocop + run: bundle exec rubocop diff --git a/test/dummy/app/views/layouts/application.html.erb b/test/dummy/app/views/layouts/application.html.erb index 30727da9b..6bf5f8447 100644 --- a/test/dummy/app/views/layouts/application.html.erb +++ b/test/dummy/app/views/layouts/application.html.erb @@ -3,7 +3,6 @@ Dummy <% if ShakapackerHelpers.available? %> - <%= javascript_include_tag "turbolinks_only", "data-turbolinks-track" => true %> <%= javascript_pack_tag "application" %> <% elsif SprocketsHelpers.available? %> <%= javascript_include_tag "application", "data-turbolinks-track" => true %> diff --git a/test/react/rails/react_rails_ujs_test.rb b/test/react/rails/react_rails_ujs_test.rb index 698f4a5d5..8ef59f373 100644 --- a/test/react/rails/react_rails_ujs_test.rb +++ b/test/react/rails/react_rails_ujs_test.rb @@ -6,6 +6,10 @@ class ReactRailsUJSTest < ActionDispatch::IntegrationTest SprocketsHelpers.when_available do include Capybara::DSL + setup do + Capybara.current_driver = Capybara.javascript_driver + end + # Normalize for shakapacker check: def assert_greeting(page, greeting) assert page.has_content?(greeting), <<~MSG