cornucopia 0.1.46 → 0.1.47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a8e94bb41c7949e5e0dbbe66d6dd7b7f96fc435
-  data.tar.gz: d1320a0ddc572ee057fca960c0c0fe4f9610052f
+  metadata.gz: fb400b1cefc8f1c4c8c8c36aa3f269b934f692d6
+  data.tar.gz: 4fedbfb5533530aca447da92ebd865ee920161c4
 SHA512:
-  metadata.gz: cad4332db00edc14962d0ac7ff22dd86f22f4a33e9f776536110606f14e903e1e2cba4a34e422f36538971e3e0bea0ff421c664af67d7a6d202f45db1a2af4e0
-  data.tar.gz: c978849262aac948e4743cc2556cd41b1bd62c3434aad3eeb85fb3f0ec590230c77d5fe7b0be28bd99cecb15edf65e2a0cb81e70424de8d7fc1afbe980d40b7d
+  metadata.gz: 8e15791520031a874468210ce5c25c476119dd38eac13dce59076b2674fef68947292c91300e74576fa0daa44abc012467e757e8c27702b87c85133ccabbc2d3
+  data.tar.gz: 1df746c8c07b51e05641b3446c31479afc400d1896cc0e63bc0100c948f7a6e351eff2eaf5874255f348096970ac53f9e378038e0136df62d399ad289c8bd291

data/lib/cornucopia/capybara/finder_diagnostics.rb

@@ -142,10 +142,21 @@ module Cornucopia
           can_dump
         end
 
+        def capybara_session
+          if Object.const_defined?("::Capybara") &&
+              ::Capybara.send(:session_pool).present?
+            my_page = ::Capybara.current_session
+
+            my_page if (my_page && my_page.current_url.present? && my_page.current_url != "about:blank")
+          end
+        rescue StandardError
+          nil
+        end
+
         # def dump_detail_args(attempt_retry, attempt_alternate_retry)
         def dump_detail_args(attempt_retry)
           check_args = search_args.clone
-          my_page    = ::Capybara.current_session
+          my_page    = capybara_session
 
           check_args << options.clone
           check_args << !!attempt_retry
@@ -363,7 +374,9 @@ module Cornucopia
 
         def all_other_elements
           unless @all_other_elements
-            from_element = ::Capybara::current_session
+            from_element = capybara_session
+
+            return unless from_element
 
             begin
               @all_other_elements = from_element.all(*search_args, visible: false, __cornucopia_no_analysis: true).to_a
@@ -464,6 +477,17 @@ module Cornucopia
 
           attr_reader :found_element
 
+          def capybara_session
+            if Object.const_defined?("::Capybara") &&
+                ::Capybara.send(:session_pool).present?
+              my_page = ::Capybara.current_session
+
+              my_page if (my_page && my_page.current_url.present? && my_page.current_url != "about:blank")
+            end
+          rescue StandardError
+            nil
+          end
+
           def ==(comparison_object)
             comparison_object.equal?(self) ||
                 (comparison_object.instance_of?(self.class) &&
@@ -505,9 +529,10 @@ module Cornucopia
 
             instance_variable_set("@native_class", @found_element[:class])
 
-            if ::Capybara.current_session.driver.respond_to?(:browser) &&
-                ::Capybara.current_session.driver.browser.respond_to?(:execute_script) &&
-                ::Capybara.current_session.driver.browser.method(:execute_script).arity != 1
+            session = capybara_session
+            if session.driver.respond_to?(:browser) &&
+                session.driver.browser.respond_to?(:execute_script) &&
+                session.driver.browser.method(:execute_script).arity != 1
               begin
                 # This is a "trick" that works with Selenium, but which might not work with other drivers...
                 script = "var attrib_list = [];
@@ -519,23 +544,23 @@ for (var nIndex = 0; nIndex < attrs.length; nIndex += 1)
 };
 return attrib_list;"
 
-                attributes = ::Capybara.current_session.driver.browser.execute_script(script, @found_element.native)
+                attributes = session.driver.browser.execute_script(script, @found_element.native)
                 attributes.each do |attritue|
                   unless PREDEFINED_ATTRIBUTES.include?(attritue)
                     instance_variable_set("@native_#{attritue.gsub(/[\-]/, "_")}", @found_element[attritue])
                   end
                 end
 
-                @elem_outerHTML ||= ::Capybara.current_session.driver.browser.execute_script("return arguments[0].outerHTML", @found_element.native)
+                @elem_outerHTML ||= session.driver.browser.execute_script("return arguments[0].outerHTML", @found_element.native)
               rescue ::Capybara::NotSupportedByDriverError
               end
             end
 
             # information from Selenium that may not be available depending on the form, the full outerHTML of the element
-            if (::Capybara.current_session.respond_to?(:evaluate_script))
+            if (session.respond_to?(:evaluate_script))
               unless (@elem_id.blank?)
                 begin
-                  @elem_outerHTML ||= ::Capybara.current_session.evaluate_script("document.getElementById('#{@elem_id}').outerHTML")
+                  @elem_outerHTML ||= session.evaluate_script("document.getElementById('#{@elem_id}').outerHTML")
                 rescue ::Capybara::NotSupportedByDriverError
                 end
               end

data/lib/cornucopia/version.rb

@@ -1,3 +1,3 @@
 module Cornucopia
-  VERSION = "0.1.46"
+  VERSION = "0.1.47"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cornucopia
 version: !ruby/object:Gem::Version
-  version: 0.1.46
+  version: 0.1.47
 platform: ruby
 authors:
 - RealNobody
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-27 00:00:00.000000000 Z
+date: 2017-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport