diff --git a/ruby/helper.rb b/ruby/helper.rb index a18baf00..4f138a2d 100644 --- a/ruby/helper.rb +++ b/ruby/helper.rb @@ -25,9 +25,10 @@ def preload(content_type, doc_uri, will_be_modified) end def load_document(doc_uri, will_be_modified) - options = self.class.name =~ /attrdefaultvalue/i ? 13 : 5 + options = self.class.name =~ /attrdefaultvalue/i ? 15 : 3 + options |= (1 << 5 | 1 << 6) file = File.join(BASE,'tests','level1','core','files',"#{doc_uri}.xml") - Nokogiri::XML.parse(File.read(file), file, nil, options) + Nokogiri.parse(File.read(file), file, nil, options) end end end diff --git a/transforms/test-to-ruby.xsl b/transforms/test-to-ruby.xsl index 99750e38..881e530a 100644 --- a/transforms/test-to-ruby.xsl +++ b/transforms/test-to-ruby.xsl @@ -1378,7 +1378,7 @@ require 'helper' .size() - .getLength() + .length ) @@ -1620,7 +1620,7 @@ require 'helper' begin - rescue DOMException => ex + rescue Nokogiri::XML::DOMException => ex # allow to fall through and fail test rescue EventException => ex # allow to fall through and fail test @@ -1640,8 +1640,8 @@ require 'helper' begin - rescue DOMException => ex - success = (ex.code == DOMException::) + rescue Nokogiri::XML::DOMException => ex + success = (ex.code == Nokogiri::XML::DOMException::) end assert(success, "") end