masque 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ce74176f64dc03dce4b0789c2dad179fd2b4674
-  data.tar.gz: 6f591a6e12e9895f433f59f3d2e823af94d21a51
+  metadata.gz: d94d73faef46aff07f7a2da237b065c72293322f
+  data.tar.gz: 825bdbe2e9a5f26f18f7c83c79563b9c1a3f088f
 SHA512:
-  metadata.gz: 6fa6ac963be6a889b0fd3dd852b7fc42fc78698518227294b1fb5b1f99d18fac0678e2f66811b558afa98dd10d9067a4222ff5ca4e961ebf12fcda1091f34788
-  data.tar.gz: f5db900a1fef41084923f4cd7d10cab59f49ad21a20d921ec01597e682410d7b33c303bc6227191d59dfdb202d0fd85297dafd3d3889658e7da21eaf98208d57
+  metadata.gz: 0c79c8ea8cebe79ddf79b4034ac69f98bb6a1e59094bc6717eeebbe04281e86173ad06e027af1c1733b6c2013a3f413816164c795562f0231e8ae0924736b829
+  data.tar.gz: 06feb166ae7e01f3594de4ee25f987b9fe830d879fb5888dea4e0573823b23b56705667eb99bf7ecf464c6703a5ebc4602e076bc0d86e601974b3396ea5493ab

data/lib/masque.rb

@@ -52,4 +52,20 @@ class Masque
   def run(&block)
     @agent.instance_eval(&block)
   end
+
+  def compat_capybara_20!
+    Capybara.configure do |config|
+      config.match = :one
+      config.exact_options = true
+      config.ignore_hidden_elements = true
+      config.visible_text_only = true
+    end
+  end
+
+  def compat_capybara_1x!
+    Capybara.configure do |config|
+      config.match = :prefer_exact
+      config.ignore_hidden_elements = false
+    end
+  end
 end

data/lib/masque/version.rb

@@ -1,3 +1,3 @@
 class Masque
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/masque.gemspec

@@ -17,9 +17,9 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
   gem.add_dependency "headless"
-  gem.add_dependency "capybara"
-  gem.add_dependency "capybara-webkit", "~> 0.14.0"
-  gem.add_dependency "poltergeist", "~> 1.1.0"
+  gem.add_dependency "capybara" # maybe 2.1.0
+  gem.add_dependency "capybara-webkit", "~> 1.0.0"
+  gem.add_dependency "poltergeist", "~> 1.3.0"
   gem.add_development_dependency "rspec", "~> 2.11"
   gem.add_development_dependency "sinatra"
   gem.add_development_dependency "simplecov"

data/spec/support/app.rb

@@ -21,8 +21,13 @@ class Dummy < Sinatra::Base
     <h1 id="visits">#{session[:visit]}</h1>
     <div id="ua">#{env["HTTP_USER_AGENT"]}</div>
     <p>Hello, World!</p>
+    <div id="hide-text"><p style="display: none">hide text</p></div>
     <div id="js"></div>
     <div id="params">#{MultiJson.dump(params)}</div>
+    <select id="numbers">
+      <option value="10">10</option>
+      <option value="11">11</option>
+    </select>
     <script>
       document.getElementById("js").innerHTML = JSON.stringify({
         h: window.innerHeight,

data/spec/support/driver.rb

@@ -87,6 +87,87 @@ shared_examples_for "driver" do
         end.to raise_error(TimeoutError)
       end
     end
+
+    describe "compat" do
+      context "2.0.x with compat_capybara_20!" do
+        before do
+          masque.compat_capybara_20!
+        end
+
+        context "config.match = :one" do
+          it "raise error multiple elements found" do
+            expect do
+              masque.run do
+                visit "/"
+                find "div"
+              end
+            end.to raise_error(Capybara::Ambiguous)
+          end
+        end
+
+        context "config.exact_options = true" do
+          it "don't find ambiguous text matching" do
+            expect do
+              masque.run do
+                visit "/"
+                page.select "1", :from => "numbers"
+              end
+            end.to raise_error(Capybara::ElementNotFound)
+          end
+        end
+
+        context "config.ignore_hidden_elements = true" do
+          it "don't find hidden element" do
+            expect do
+              masque.run do
+                visit "/dummy"
+                find "title", :text => "hi dummy"
+              end
+            end.to raise_error(Capybara::ElementNotFound)
+          end
+        end
+
+        context "config.visible_text_only = true" do
+          it do
+            pending "capybara-webkit 1.0.0 can't handle correctly" if driver == :webkit
+
+            masque.run do
+              visit "/"
+              find("#hide-text").text.should == ""
+            end
+          end
+        end
+      end
+
+      context "1.x with compat_capybara_1x!" do
+        before do
+          masque.compat_capybara_1x!
+        end
+
+        context "config.match = :prefer_exact" do
+          it "don't raise error multiple elements found" do
+            expect do
+              masque.run do
+                visit "/"
+                find "div"
+              end
+            end.to_not raise_error
+          end
+        end
+
+        context "config.ignore_hidden_elements = false" do
+          it "can find hidden element" do
+            expect do
+              masque.run do
+                visit "/dummy"
+                find "title", :text => "hi dummy"
+              end
+            end.to_not raise_error
+          end
+        end
+
+      end
+    end
   end
 
   it "#reset_session!" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: masque
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - uu59
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-30 00:00:00.000000000 Z
+date: 2013-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: headless
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: poltergeist
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -166,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: JavaScript enabled web crawler kit