From d7bf8225ae82f7bc97f0831c9e4d1e3c2dce2d3e Mon Sep 17 00:00:00 2001 From: yeatsapril Date: Wed, 20 Jan 2021 10:18:46 +0100 Subject: [PATCH 1/2] Bump nokogiri from 1.10.10 to 1.11.0.rc4 --- filemaker.gemspec | 2 +- spec/spec_helper.rb | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/filemaker.gemspec b/filemaker.gemspec index 055f7b2..4d29de7 100644 --- a/filemaker.gemspec +++ b/filemaker.gemspec @@ -19,7 +19,7 @@ Gem::Specification.new do |spec| spec.require_paths = ['lib'] spec.add_runtime_dependency 'typhoeus' - spec.add_runtime_dependency 'nokogiri', '~> 1.10.10' + spec.add_runtime_dependency 'nokogiri', '>= 1.11.0.rc4' spec.add_runtime_dependency 'activemodel' spec.add_runtime_dependency 'globalid' diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 7578634..197bb21 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,3 +1,5 @@ +require 'active_support' +require 'active_support/core_ext' require 'filemaker' require 'pry' require_relative 'support/xml_loader' From 2c9a896ed936d437c198f7b18978cdecb6b9e9ae Mon Sep 17 00:00:00 2001 From: yeatsapril Date: Wed, 20 Jan 2021 10:27:25 +0100 Subject: [PATCH 2/2] require uri in spec_helper --- spec/spec_helper.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 197bb21..77c1077 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,5 +1,4 @@ -require 'active_support' -require 'active_support/core_ext' +require 'uri' require 'filemaker' require 'pry' require_relative 'support/xml_loader'