spreewald 0.1.0 → 0.1.1

data/lib/spreewald/web_steps.rb

@@ -312,15 +312,56 @@ When /^I reload the page$/ do
 end
 
 Then /^"([^\"]+)" should( not)? be visible$/ do |text, negate|
-  paths = [
-    "//*[@class='hidden']/*[contains(.,'#{text}')]",
-    "//*[@class='invisible']/*[contains(.,'#{text}')]",
-    "//*[@style='display: none;']/*[contains(.,'#{text}')]"
-  ]
-  xpath = paths.join '|'
-  expectation = negate ? :should : :should_not
-  patiently do
-    page.send(expectation, have_xpath(xpath))
+  case Capybara::current_driver
+  when :selenium, :webkit
+    visibility_detecting_javascript = %[
+      (function() {
+
+        var containsSelector = ':contains(#{text.to_json})';
+        var jqueryLoaded = (typeof jQuery != 'undefined');
+
+        function findCandidates() {
+          if (jqueryLoaded) {
+            return $(containsSelector);
+          } else {
+            return $$(containsSelector);
+          }
+        }
+
+        function isExactCandidate(candidate) {
+          if (jqueryLoaded) {
+            return $(candidate).children().find(containsSelector).length == 0;
+          } else {
+            return candidate.select(containsSelector).length == 0;
+          }
+        }
+
+        function elementVisible(element) {
+          if (jqueryLoaded) {
+            return $(element).is(':visible');
+          } else {
+            return element.offsetWidth > 0 && element.offsetHeight > 0;
+          }
+        }
+
+        var candidates = findCandidates();
+
+        for (var i = 0; i < candidates.length; i++) {
+          var candidate = candidates[i];
+          if (isExactCandidate(candidate) && elementVisible(candidate)) {
+            return true;
+          }
+        }
+        return false;
+
+      })();
+    ].gsub(/\n/, ' ')
+    matcher = negate ? be_false : be_true
+    page.evaluate_script(visibility_detecting_javascript).should matcher
+  else
+    invisibility_detecting_matcher = have_css('.hidden, .invisible, [style~="display: none"]', :text => text)
+    expectation = negate ? :should : :should_not # sic
+    page.send(expectation, invisibility_detecting_matcher)
   end
 end
 

data/lib/spreewald_support/version.rb

@@ -1,3 +1,3 @@
 module Spreewald
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spreewald
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Tobias Kraze
@@ -15,7 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-21 00:00:00 Z
+date: 2012-10-26 00:00:00 +02:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: cucumber-rails
@@ -91,6 +92,7 @@ files:
 - lib/spreewald_support/tolerance_for_selenium_sync_issues.rb
 - lib/spreewald_support/version.rb
 - spreewald.gemspec
+has_rdoc: true
 homepage: https://github.com/makandra/spreewald
 licenses: []
 
@@ -120,10 +122,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.3.9.5
 signing_key: 
 specification_version: 3
 summary: Collection of useful cucumber steps.
 test_files: []
 
-has_rdoc: