Skip to content

Fix CI #2309

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 21, 2025
Merged

Fix CI #2309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5120b09
trigger ci
joelhawksley May 20, 2025
e700e9a
puts debug
joelhawksley May 20, 2025
1d15c33
rails-dom-testing now collapses whitespace
joelhawksley May 21, 2025
6041bdb
lint
joelhawksley May 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 25 additions & 22 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,16 +114,17 @@ GEM
concurrent-ruby (1.3.5)
connection_pool (2.5.3)
crass (1.0.6)
cuprite (0.15.1)
cuprite (0.17)
capybara (~> 3.0)
ferrum (~> 0.15.0)
ferrum (~> 0.17.0)
date (3.4.1)
debug (1.10.0)
irb (~> 1.10)
reline (>= 0.3.8)
diff-lcs (1.6.1)
diff-lcs (1.6.2)
docile (1.4.1)
drb (2.2.1)
drb (2.2.3)
erb (5.0.1)
erb_lint (0.9.0)
activesupport
better_html (>= 2.0.1)
Expand All @@ -132,8 +133,9 @@ GEM
rubocop (>= 1)
smart_properties
erubi (1.13.1)
ferrum (0.15)
ferrum (0.17.1)
addressable (~> 2.5)
base64 (~> 0.2)
concurrent-ruby (~> 1.1)
webrick (~> 1.7)
websocket-driver (~> 0.7)
Expand All @@ -153,11 +155,11 @@ GEM
jbuilder (2.13.0)
actionview (>= 5.0.0)
activesupport (>= 5.0.0)
json (2.11.3)
language_server-protocol (3.17.0.4)
json (2.12.0)
language_server-protocol (3.17.0.5)
lint_roller (1.1.0)
logger (1.7.0)
loofah (2.24.0)
loofah (2.24.1)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
m (1.6.2)
Expand All @@ -172,7 +174,7 @@ GEM
matrix (0.4.2)
method_source (1.1.0)
mini_mime (1.1.5)
mini_portile2 (2.8.8)
mini_portile2 (2.8.9)
minitest (5.25.5)
mutex_m (0.3.0)
net-imap (0.5.8)
Expand Down Expand Up @@ -204,15 +206,15 @@ GEM
pry (0.15.2)
coderay (~> 1.1)
method_source (~> 1.0)
psych (5.2.3)
psych (5.2.6)
date
stringio
public_suffix (6.0.1)
public_suffix (6.0.2)
puma (6.6.0)
nio4r (~> 2.0)
racc (1.8.1)
rack (3.1.13)
rack-session (2.1.0)
rack (3.1.15)
rack-session (2.1.1)
base64 (>= 0.1.0)
rack (>= 3.0.0)
rack-test (2.2.0)
Expand All @@ -233,7 +235,7 @@ GEM
activesupport (= 8.0.2)
bundler (>= 1.15.0)
railties (= 8.0.2)
rails-dom-testing (2.2.0)
rails-dom-testing (2.3.0)
activesupport (>= 5.0.0)
minitest
nokogiri (>= 1.6)
Expand All @@ -250,18 +252,19 @@ GEM
zeitwerk (~> 2.6)
rainbow (3.1.1)
rake (13.2.1)
rdoc (6.13.1)
rdoc (6.14.0)
erb
psych (>= 4.0.0)
regexp_parser (2.10.0)
reline (0.6.1)
io-console (~> 0.5)
rexml (3.4.1)
rspec-core (3.13.3)
rspec-support (~> 3.13.0)
rspec-expectations (3.13.3)
rspec-expectations (3.13.4)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
rspec-mocks (3.13.2)
rspec-mocks (3.13.4)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
rspec-rails (5.1.2)
Expand All @@ -272,8 +275,8 @@ GEM
rspec-expectations (~> 3.10)
rspec-mocks (~> 3.10)
rspec-support (~> 3.10)
rspec-support (3.13.2)
rubocop (1.75.4)
rspec-support (3.13.3)
rubocop (1.75.6)
json (~> 2.3)
language_server-protocol (~> 3.17.0.2)
lint_roller (~> 1.1.0)
Expand Down Expand Up @@ -322,10 +325,10 @@ GEM
actionpack (>= 5.2)
activesupport (>= 5.2)
sprockets (>= 3.0.0)
standard (1.49.0)
standard (1.50.0)
language_server-protocol (~> 3.17.0.2)
lint_roller (~> 1.0)
rubocop (~> 1.75.2)
rubocop (~> 1.75.5)
standard-custom (~> 1.0.0)
standard-performance (~> 1.8)
standard-custom (1.0.2)
Expand Down Expand Up @@ -364,7 +367,7 @@ GEM
yard (0.9.37)
yard-activesupport-concern (0.0.1)
yard (>= 0.8)
zeitwerk (2.7.2)
zeitwerk (2.7.3)

PLATFORMS
ruby
Expand Down
4 changes: 2 additions & 2 deletions test/sandbox/test/integration_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ def test_rendering_component_in_a_view
get "/"
assert_response :success

assert_select("div", "Foo\n bar")
assert_select("div", "Foo bar")
end

if Rails.version.to_f >= 6.1
Expand All @@ -21,7 +21,7 @@ def test_rendering_component_with_template_annotations_enabled

assert_includes response.body, "BEGIN app/components/erb_component.html.erb"

assert_select("div", "Foo\n bar")
assert_select("div", "Foo bar")
end
end

Expand Down
2 changes: 1 addition & 1 deletion test/sandbox/test/layouts_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class LayoutsTest < ActionDispatch::IntegrationTest
test "rendering with_content_for" do
get "/layout_with_content_for"
assert_response :success
assert_select 'body[data-layout="with_content_for"]', "Hello content for\n\n Foo: bar"
assert_select 'body[data-layout="with_content_for"]', "Hello content for Foo: bar"
end
end
end
Loading