capybara 2.12.0 → 2.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc177e8165f5b72a1dc1c1303b726701bc24254c
-  data.tar.gz: dab6b087b3ef03904d496bef6d3f66e2736b5bbd
+  metadata.gz: 366aecdcbfc57f6102bd9216645cfdb69dea2f0e
+  data.tar.gz: 989edd37eea1f619de795362350584f25af60b17
 SHA512:
-  metadata.gz: f21cbebab1e87a9b9a411caf05acab9d912257604d6004db90af7439a692b862966e11291134424105698477b772cca46774aa95aad6ab78bdecd827ab862e83
-  data.tar.gz: c643a679ac6ac6cf17f03d63f74a97a20919980eead96c30b8b8c571120b19e0f94d2b7be978878580c6365483cc41476a83710b96200559e6be124dce620af0
+  metadata.gz: ccd1760a40ac203ebf7ba2b38104e64e9eea0446ccc596898b8467f5c0471f37e003ca84616c82843426928b6997d7be3b748beb85aa00e34a70573551027427
+  data.tar.gz: 7d51a1a4fc3c405774710bd4eae7d922fa1957d5900f50c68a5f58c70f762d73d11ac00964654c7408320c10c4b401dea588e3eec35f9cc3f13482a42aca1362

data/History.md

@@ -1,3 +1,9 @@
+#Version 2.12.1
+Release date: 2017-02-16
+
+### Fixed
+*  Disable lazy Capybara::Results evaluation for JRuby due to ongoing issues
+
 #Version 2.12.0
 Release date: 2017-01-22
 

data/lib/capybara/queries/current_path_query.rb

@@ -29,7 +29,7 @@ module Capybara
         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
 

data/lib/capybara/queries/selector_query.rb

@@ -42,7 +42,7 @@ module Capybara
 
       def description
         @description = String.new("#{label} #{locator.inspect}")
-        @description << " with#{" exact" if exact_text === true} text #{options[:text].inspect}" if options[:text]
+        @description << " with#{" exact" if exact_text == true} text #{options[:text].inspect}" if options[:text]
         @description << " with exact text #{options[:exact_text]}" if options[:exact_text].is_a?(String)
         @description << " with id #{options[:id]}" if options[:id]
         @description << " with classes #{Array(options[:class]).join(',')}]" if options[:class]
@@ -56,7 +56,7 @@ module Capybara
           regexp = if options[:text].is_a?(Regexp)
             options[:text]
           else
-            if exact_text === true
+            if exact_text == true
               "\\A#{Regexp.escape(options[:text].to_s)}\\z"
             else
               Regexp.escape(options[:text].to_s)
@@ -205,7 +205,7 @@ module Capybara
       end
 
       def exact_text
-        exact_text = options.fetch(:exact_text, Capybara.exact_text)
+        options.fetch(:exact_text, Capybara.exact_text)
       end
     end
   end

data/lib/capybara/result.rb

@@ -28,11 +28,6 @@ module Capybara
       @result_cache = []
       @results_enum = lazy_select_elements { |node| query.matches_filters?(node) }
       @query = query
-      # JRuby < 9.1.6.0 has an issue with eagerly finding next in lazy enumerators which
-      # causes a concurrency issue with network requests here
-      # https://github.com/jruby/jruby/issues/4212
-      # Just force all the results to be evaluated
-      full_results if RUBY_PLATFORM == 'java' && (Gem::Version.new(JRUBY_VERSION) < Gem::Version.new('9.1.6.0'))
     end
 
     def_delegators :full_results, :size, :length, :last, :values_at, :inspect, :sample
@@ -138,7 +133,12 @@ module Capybara
     end
 
     def lazy_select_elements(&block)
-      if @elements.respond_to? :lazy  #Ruby 2.0+
+      # JRuby has an issue with lazy enumerators which
+      # causes a concurrency issue with network requests here
+      # https://github.com/jruby/jruby/issues/4212
+      if RUBY_PLATFORM == 'java'
+        @elements.select(&block).to_enum  # non-lazy evaluation
+      elsif @elements.respond_to? :lazy  #Ruby 2.0+
         @elements.lazy.select(&block)
       else
         Enumerator.new do |yielder|

data/lib/capybara/selector.rb

@@ -8,12 +8,12 @@ Capybara::Selector::FilterSet.add(:_field) do
 
   describe do |options|
     desc, states = String.new, []
-    states << 'checked' if options[:checked] || (options[:unchecked] === false)
-    states << 'not checked' if options[:unchecked] || (options[:checked] === false)
+    states << 'checked' if options[:checked] || (options[:unchecked] == false)
+    states << 'not checked' if options[:unchecked] || (options[:checked] == false)
     states << 'disabled' if options[:disabled] == true
     desc << " that is #{states.join(' and ')}" unless states.empty?
     desc << " with the multiple attribute" if options[:multiple] == true
-    desc << " without the multiple attribute" if options[:multiple] === false
+    desc << " without the multiple attribute" if options[:multiple] == false
     desc
   end
 end

data/lib/capybara/session.rb

@@ -172,7 +172,7 @@ module Capybara
     #
     def current_path
       # Addressable parsing is more lenient than URI
-      uri = Addressable::URI.parse(current_url)
+      uri = ::Addressable::URI.parse(current_url)
 
       # If current_url ends up being nil, won't be able to call .path on a NilClass.
       return nil if uri.nil?

data/lib/capybara/spec/views/buttons.erb

@@ -1,4 +1,4 @@
-<%# frozen_string_literal: true %>
+
 <h1>Buttons</h1>
 <button>Click me!</button>
 <button id="click_me_123">Click me by id!</button>

data/lib/capybara/spec/views/fieldsets.erb

@@ -1,4 +1,4 @@
-<%# frozen_string_literal: true %>
+
 <form action="/form" method="post">
   <fieldset id="agent_fieldset">
     <legend>Agent</legend>

data/lib/capybara/spec/views/form.erb

@@ -1,4 +1,4 @@
-<%# frozen_string_literal: true %>
+
 <h1>Form</h1>
 
 <form action="/form" method="post">

data/lib/capybara/spec/views/frame_child.erb

@@ -1,4 +1,4 @@
-<%# frozen_string_literal: true %>
+
 <html>
     <head>
         <title>This is the child frame title</title>

data/lib/capybara/spec/views/frame_one.erb

@@ -1,4 +1,4 @@
-<%# frozen_string_literal: true %>
+
 <html>
     <head>
         <title>This is the title of frame one</title>

data/lib/capybara/spec/views/frame_parent.erb

@@ -1,4 +1,4 @@
-<%# frozen_string_literal: true %>
+
 <html>
     <head>
         <title>This is the parent frame title</title>

data/lib/capybara/spec/views/frame_two.erb

@@ -1,4 +1,4 @@
-<%# frozen_string_literal: true %>
+
 <html>
     <head>
         <title>This is the title of frame two</title>

data/lib/capybara/spec/views/header_links.erb

@@ -1,4 +1,4 @@
-<%# frozen_string_literal: true %>
+
 <p>
   <a href="/get_header">Link</a>
 </p>

data/lib/capybara/spec/views/host_links.erb

@@ -1,4 +1,4 @@
-<%# frozen_string_literal: true %>
+
 <p>
   <a href="/host">Relative Host</a>
   <a href="<%= params[:absolute_host] %>/host">Absolute Host</a>

data/lib/capybara/spec/views/path.erb

@@ -1,4 +1,4 @@
-<%# frozen_string_literal: true %>
+
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
   <body>
     <div>

data/lib/capybara/spec/views/popup_one.erb

@@ -1,4 +1,4 @@
-<%# frozen_string_literal: true %>
+
 <html>
     <head>
         <title>Title of the first popup</title>

data/lib/capybara/spec/views/popup_two.erb

@@ -1,4 +1,4 @@
-<%# frozen_string_literal: true %>
+
 <html>
     <head>
         <title>Title of popup two</title>

data/lib/capybara/spec/views/postback.erb

@@ -1,4 +1,4 @@
-<%# frozen_string_literal: true %>
+
 <h1>Postback</h1>
 
 <form method="get">

data/lib/capybara/spec/views/tables.erb

@@ -1,4 +1,4 @@
-<%# frozen_string_literal: true %>
+
 <form action="/form" method="post">
   <table id="agent_table">
     <caption>Agent</caption>

data/lib/capybara/spec/views/with_base_tag.erb

@@ -1,4 +1,4 @@
-<%# frozen_string_literal: true %>
+
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
   <head>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>

data/lib/capybara/spec/views/with_count.erb

@@ -1,4 +1,4 @@
-<%# frozen_string_literal: true %>
+
 <h1>This page is used for testing number options of has_text?</h1>
 
 <p>count1</p>

data/lib/capybara/spec/views/with_hover.erb

@@ -1,4 +1,4 @@
-<%# frozen_string_literal: true %>
+
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
   <head>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>

data/lib/capybara/spec/views/with_html.erb

@@ -1,4 +1,4 @@
-<%# frozen_string_literal: true %>
+
 <div id="referrer"><%= referrer %></div>
 <h1>This is a test</h1>
 

data/lib/capybara/spec/views/with_html_entities.erb

@@ -1,2 +1,2 @@
-<%# frozen_string_literal: true %>
+
 Encoding with &mdash; html entities &raquo;

data/lib/capybara/spec/views/with_js.erb

@@ -1,4 +1,4 @@
-<%# frozen_string_literal: true %>
+
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
   <head>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>

data/lib/capybara/spec/views/with_scope.erb

@@ -1,4 +1,4 @@
-<%# frozen_string_literal: true %>
+
 <h1>This page is used for testing various scopes</h1>
 
 <p id="for_foo">

data/lib/capybara/spec/views/with_simple_html.erb

@@ -1,2 +1,2 @@
-<%# frozen_string_literal: true %>
+
 Bar

data/lib/capybara/spec/views/with_title.erb

@@ -1,4 +1,4 @@
-<%# frozen_string_literal: true %>
+
 <title>Test Title</title>
 <body>
   <svg><title>abcdefg</title></svg>

data/lib/capybara/spec/views/with_windows.erb

@@ -1,4 +1,4 @@
-<%# frozen_string_literal: true %>
+
 <html>
   <head>
     <title>With Windows</title>

data/lib/capybara/spec/views/within_frames.erb

@@ -1,4 +1,4 @@
-<%# frozen_string_literal: true %>
+
 <html>
     <head>
         <title>With Frames</title>

data/lib/capybara/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Capybara
-  VERSION = '2.12.0'
+  VERSION = '2.12.1'
 end

data/spec/result_spec.rb

@@ -73,7 +73,7 @@ RSpec.describe Capybara::Result do
 
   #Not a great test but it indirectly tests what is needed
   it "should evaluate filters lazily" do
-    skip 'JRuby has an issue with lazy enumerator next evaluation' if RUBY_PLATFORM == 'java' && (Gem::Version.new(JRUBY_VERSION) < Gem::Version.new('9.1.6.0'))
+    skip 'JRuby has an issue with lazy enumerator evaluation' if RUBY_PLATFORM == 'java'
     #Not processed until accessed
     expect(result.instance_variable_get('@result_cache').size).to be 0
 
@@ -95,7 +95,7 @@ RSpec.describe Capybara::Result do
 
   context '#each' do
     it 'lazily evaluates' do
-      skip 'JRuby has an issue with lazy enumerator next evaluation' if RUBY_PLATFORM == 'java' && (Gem::Version.new(JRUBY_VERSION) < Gem::Version.new('9.1.6.0'))
+      skip 'JRuby has an issue with lazy enumerator evaluation' if RUBY_PLATFORM == 'java'
       results=[]
       result.each do |el|
         results << el
@@ -111,7 +111,7 @@ RSpec.describe Capybara::Result do
       end
 
       it 'lazily evaluates' do
-        skip 'JRuby has an issue with lazy enumerator next evaluation' if RUBY_PLATFORM == 'java' && (Gem::Version.new(JRUBY_VERSION) < Gem::Version.new('9.1.6.0'))
+        skip 'JRuby has an issue with lazy enumerator evaluation' if RUBY_PLATFORM == 'java'
         result.each.with_index do |el, idx|
           expect(result.instance_variable_get('@result_cache').size).to eq(idx+1)  # 0 indexing
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara
 version: !ruby/object:Gem::Version
-  version: 2.12.0
+  version: 2.12.1
 platform: ruby
 authors:
 - Thomas Walpole
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain:
 - gem-public_cert.pem
-date: 2017-01-22 00:00:00.000000000 Z
+date: 2017-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -452,7 +452,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Capybara aims to simplify the process of integration testing Rack applications,