Skip to content
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

ci: declare mutex_m in Gemfile; it's been removed from ruby 3.4 #3092

Merged
merged 2 commits into from
Jan 12, 2024
Merged

ci: declare mutex_m in Gemfile; it's been removed from ruby 3.4 #3092

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a5eb8c1
ci: declare mutex_m in Gemfile; it's been removed from ruby 3.4
flavorjones Jan 12, 2024
9215497
test: remove unnecessary dependency on NKF
flavorjones Jan 12, 2024
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
6 changes: 6 additions & 0 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ source "https://rubygems.org"
gemspec

group :development do
# ruby 3.4.0-dev removed some gems from the default set
#
# TODO: we should be able to remove these as our gem dependencies sort it out and we pull them in
# transitively.
gem "mutex_m"

# bootstrapping
gem "bundler", "~> 2.3"
gem "rake", "13.1.0"
Expand Down
12 changes: 2 additions & 10 deletions test/html4/test_node.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

require "helper"

require "nkf"

module Nokogiri
module HTML
class TestNode < Nokogiri::TestCase
Expand Down Expand Up @@ -170,14 +168,8 @@ def test_fragment_serialization
end

def test_to_html_does_not_contain_entities
return unless defined?(NKF) # NKF is not implemented on Rubinius as of 2009-11-23

html = NKF.nkf("-e --msdos", <<-EOH)
<html><body>
<p> test paragraph
foo bar </p>
</body></html>
EOH
# as generated by a tool like NKF
html = "<html><body>\r\n<p> test paragraph\r\nfoo bar </p>\r\n</body></html>\r\n"
nokogiri = Nokogiri::HTML4.parse(html)

if RUBY_PLATFORM.include?("java")
Expand Down
Loading