From 7968270a062bad4f0440297c8ef740ecabc9cfa3 Mon Sep 17 00:00:00 2001 From: "yuuji.yaginuma" Date: Tue, 19 Jan 2016 08:04:33 +0900 Subject: [PATCH 1/9] fix typo in parameter name [ci skip] --- History.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/History.md b/History.md index ee5a28b3..52efa008 100644 --- a/History.md +++ b/History.md @@ -15,7 +15,7 @@ Relase date: 2016-01-17 * Selenium driver supports a :clear option to #set to handle different strategies for clearing a field [Tom Walpole] * Support the use of rack 2.0 with the rack_test driver [Travis Grathwell, Tom Walpole] * Disabled option for default selectors now supports true, false, or :all [Jillian Rosile, Tom Walpole] -* Modal API methods now default wait time to Capybara.max_default_wait_time [Tom Walpole] +* Modal API methods now default wait time to Capybara.default_max_wait_time [Tom Walpole] # Version 2.5.0 Release date: 2015-08-25 From 2e2290a22510a36c1d77b8236dc983a037505dd7 Mon Sep 17 00:00:00 2001 From: Jorge Bejar Date: Wed, 27 Jan 2016 15:53:59 -0300 Subject: [PATCH 2/9] Require addressable gem in CurrentPathQuery The following commit used Addressable to normalize path comparisons: https://github.com/jnicklas/capybara/commit/d6a824c00e8ab9e1d9c76651c729ebe866b2e14b However, it's causing a NameError if the addressable gem is not loaded, so we're requiring it in this specific location. --- lib/capybara/queries/current_path_query.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/capybara/queries/current_path_query.rb b/lib/capybara/queries/current_path_query.rb index fb412cea..72655ffc 100644 --- a/lib/capybara/queries/current_path_query.rb +++ b/lib/capybara/queries/current_path_query.rb @@ -1,3 +1,5 @@ +require 'addressable' + module Capybara # @api private module Queries From 8ee3dbefb4c04e9fa3f8483e73de4975b5393dbb Mon Sep 17 00:00:00 2001 From: Thomas Walpole Date: Wed, 27 Jan 2016 11:41:09 -0800 Subject: [PATCH 3/9] tagged 2.6.1 --- lib/capybara/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/capybara/version.rb b/lib/capybara/version.rb index a7271d56..a5832118 100644 --- a/lib/capybara/version.rb +++ b/lib/capybara/version.rb @@ -1,3 +1,3 @@ module Capybara - VERSION = '2.6.0' + VERSION = '2.6.1' end From e65367ff39a4797d97f0714141ec6ef380eeb126 Mon Sep 17 00:00:00 2001 From: Thomas Walpole Date: Wed, 27 Jan 2016 11:43:12 -0800 Subject: [PATCH 4/9] update history --- History.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/History.md b/History.md index 52efa008..fdabe2fd 100644 --- a/History.md +++ b/History.md @@ -1,3 +1,9 @@ +# Version 2.6.1 +Release data: 2016-01-27 + +### Fixed +* Add missing require for addressable [Jorge Bejar] + # Version 2.6.0 Relase date: 2016-01-17 From b6f4aaa32f5128a7cd512b90005342b484f31ca2 Mon Sep 17 00:00:00 2001 From: Thomas Walpole Date: Wed, 27 Jan 2016 14:20:47 -0800 Subject: [PATCH 5/9] allow for more versions of addressable --- lib/capybara/queries/current_path_query.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/capybara/queries/current_path_query.rb b/lib/capybara/queries/current_path_query.rb index 72655ffc..6010df5d 100644 --- a/lib/capybara/queries/current_path_query.rb +++ b/lib/capybara/queries/current_path_query.rb @@ -1,4 +1,4 @@ -require 'addressable' +require 'addressable/uri' module Capybara # @api private From 959fddf44c55852d917bd526f5c071426ca1263b Mon Sep 17 00:00:00 2001 From: Thomas Walpole Date: Wed, 27 Jan 2016 14:52:51 -0800 Subject: [PATCH 6/9] make sure we work with addressable < 2.4.0 --- gemfiles/Gemfile.base-versions | 1 + 1 file changed, 1 insertion(+) diff --git a/gemfiles/Gemfile.base-versions b/gemfiles/Gemfile.base-versions index 2f22a7bb..aa8f5c84 100644 --- a/gemfiles/Gemfile.base-versions +++ b/gemfiles/Gemfile.base-versions @@ -12,5 +12,6 @@ gem 'rspec', '= 2.2.0' gem 'cucumber', '= 0.10.5' gem 'tins', '= 1.6.0' # 1.7.0 requires ruby 2.0 gem 'mime-types', '<3.0' # 3.0 require ruby 2.0 +gem 'addressable', '< 2.4.0' # 2.4.0 allows require 'addressable' previous don't # We cannot test against older versions of selenium-webdriver without # installing older compatible Firefox versions. From f26351c0f2644b1b20aa9e49ad9a7548b4606b62 Mon Sep 17 00:00:00 2001 From: Thomas Walpole Date: Wed, 27 Jan 2016 15:01:33 -0800 Subject: [PATCH 7/9] scope addressable --- lib/capybara/queries/current_path_query.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/capybara/queries/current_path_query.rb b/lib/capybara/queries/current_path_query.rb index 6010df5d..dc15f455 100644 --- a/lib/capybara/queries/current_path_query.rb +++ b/lib/capybara/queries/current_path_query.rb @@ -17,16 +17,16 @@ module Capybara session.current_url else if options[:only_path] - Addressable::URI.parse(session.current_url).path + ::Addressable::URI.parse(session.current_url).path else - Addressable::URI.parse(session.current_url).request_uri + ::Addressable::URI.parse(session.current_url).request_uri end end if @expected_path.is_a? Regexp @actual_path.match(@expected_path) else - Addressable::URI.parse(@expected_path) == Addressable::URI.parse(@actual_path) + ::Addressable::URI.parse(@expected_path) == Addressable::URI.parse(@actual_path) end end From f55210e26f02d006ad400ad73b241f397d8aef3c Mon Sep 17 00:00:00 2001 From: Thomas Walpole Date: Wed, 27 Jan 2016 15:14:32 -0800 Subject: [PATCH 8/9] update history [ci skip] --- History.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/History.md b/History.md index fdabe2fd..8ede712b 100644 --- a/History.md +++ b/History.md @@ -1,5 +1,11 @@ +#Version 2.6.2 +Relase date: 2016-01-27 + +### Fixed +* support for more than just addressable 2.4.0 [Thomas Walpole] + # Version 2.6.1 -Release data: 2016-01-27 +Release date: 2016-01-27 ### Fixed * Add missing require for addressable [Jorge Bejar] From 696f3e74557e413f0395d44c2805c18ad45cbb9c Mon Sep 17 00:00:00 2001 From: Thomas Walpole Date: Wed, 27 Jan 2016 15:41:05 -0800 Subject: [PATCH 9/9] tagged 2.6.2 --- lib/capybara/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/capybara/version.rb b/lib/capybara/version.rb index a5832118..d06b67e3 100644 --- a/lib/capybara/version.rb +++ b/lib/capybara/version.rb @@ -1,3 +1,3 @@ module Capybara - VERSION = '2.6.1' + VERSION = '2.6.2' end