Skip to content

Commit

Permalink
possible ci fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Judahmeek committed May 13, 2024
1 parent 9efe604 commit c137a17
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ jobs:
ruby-version: ${{ matrix.ruby }}
bundler-cache: true
- name: Run rubocop
run: rubocop
run: bundle exec rubocop
1 change: 0 additions & 1 deletion test/dummy/app/views/layouts/application.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
<head>
<title>Dummy</title>
<% 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 %>
Expand Down
4 changes: 4 additions & 0 deletions test/react/rails/react_rails_ujs_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit c137a17

Please sign in to comment.