capybara-envjs 0.1.5 → 0.1.6

data/CHANGELOG.rdoc

@@ -1,3 +1,10 @@
+=== 0.1.6 / 2010-07-05
+
+* scope select to node
+* Select bug fix and bring up to date with recent capy changes
+* implement value for textareas
+* doc tweaks [Kurt Werle]
+
 === 0.1.5 / 2010-06-02
 
 * Finish cleanup of rack-test host handling

data/README.rdoc

@@ -23,6 +23,11 @@ Install as a gem:
 
 See the Capybara docs. Use the symbol :envjs for the driver/default_driver as appropriate.
 
+If you are using cucumber, you might add the following lines to your features/support/env.rb
+
+  require 'capybara/envjs'
+  Capybara.javascript_driver = :envjs
+
 == License:
 
 (The MIT License)

data/Rakefile

@@ -1,3 +1,5 @@
+# -*- Mode: Ruby -*-
+
 require 'rubygems'
 
 gem 'hoe', '>= 2.5'
@@ -9,18 +11,18 @@ Hoe.plugins.delete :rubyforge
 
 Hoe.spec 'capybara-envjs' do
   developer 'Steven Parkes', 'smparkes@smparkes.net'
-  self.version = "0.1.5"
+  self.version = "0.1.6"
 
   self.readme_file      = 'README.rdoc'
   self.extra_rdoc_files = Dir['*.rdoc']
 
   self.extra_deps = [
-    ['capybara', '>= 0.3.8'],
-    ['envjs', '>= 0.3.6']
+    ['capybara', '>= 0.3.9'],
+    ['envjs', '>= 0.3.7']
   ]
 
   self.extra_dev_deps = [
-    ['rack-test', '>= 0.5.3'],
+    ['rack-test', '>= 0.5.4'],
     ['rspec', '>= 1.3.0']
   ]
 end

data/lib/capybara/driver/envjs_driver.rb

@@ -53,6 +53,14 @@ class Capybara::Driver::Envjs < Capybara::Driver::Base
       end
     end
 
+    def value
+      if tag_name == 'textarea'
+        node.innerText
+      else
+        super
+      end
+    end
+
     def set(value)
       case node.tagName
       when "TEXTAREA"
@@ -68,8 +76,8 @@ class Capybara::Driver::Envjs < Capybara::Driver::Base
 
     def select(option)
       escaped = Capybara::XPath.escape(option)
-      option_node = all_unfiltered("//option[text()=#{escaped}]") || all_unfiltered("//option[contains(.,#{escaped})]")
-      option_node[0].node.selected = true
+      option_node = all_unfiltered(".//option[text()=#{escaped}]").first || all_unfiltered(".//option[contains(.,#{escaped})]").first
+      option_node.node.selected = true
     rescue Exception => e
       options = all_unfiltered(".//option").map { |o| "'#{o.text}'" }.join(', ')
       raise Capybara::OptionNotFound, "No such option '#{option}' in this select box. Available options: #{options}"
@@ -82,7 +90,7 @@ class Capybara::Driver::Envjs < Capybara::Driver::Base
 
       begin
         escaped = Capybara::XPath.escape(option)
-        option_node = (all_unfiltered("//option[text()=#{escaped}]") || all_unfiltered("//option[contains(.,#{escaped})]")).first
+        option_node = (all_unfiltered(".//option[text()=#{escaped}]") || all_unfiltered(".//option[contains(.,#{escaped})]")).first
         option_node.node.selected = false
       rescue Exception => e
         options = all_unfiltered(".//option").map { |o| "'#{o.text}'" }.join(', ')
@@ -196,6 +204,7 @@ class Capybara::Driver::Envjs < Capybara::Driver::Base
         if e["CONTENT_TYPE"] =~ %r{^multipart/form-data;}
           e["CONTENT_LENGTH"] ||= params.length
         end
+        times = 0
         begin
           if url.index(app_host) == 0
             url.slice! 0..(app_host.length-1)
@@ -203,6 +212,9 @@ class Capybara::Driver::Envjs < Capybara::Driver::Base
           # puts "send #{method} #{url} #{params}"
           send method, url, params, e
           while response.status == 302 || response.status == 301
+            if (times += 1) > 5
+              raise Capybara::InfiniteRedirectError, "redirected more than 5 times, check for infinite redirects."
+            end
             params = {}
             method = :get
             url = response.location
@@ -213,7 +225,7 @@ class Capybara::Driver::Envjs < Capybara::Driver::Base
             send method, url, params, e
           end
         rescue Exception => e
-          print "got #{e} #{response.inspect}\n"
+          # print "got #{e} #{response.inspect}\n"
           raise e
         end
         @source = response.body
@@ -254,6 +266,10 @@ class Capybara::Driver::Envjs < Capybara::Driver::Base
     browser["window"].document.xml
   end
 
+  def cleanup!
+    clear_cookies
+  end
+
   class Headers
     def initialize hash
       @hash = hash
@@ -268,11 +284,14 @@ class Capybara::Driver::Envjs < Capybara::Driver::Base
     Headers.new(browser["window"]["document"]["__headers__"])
   end
 
+  def status_code
+    response.status
+  end
+
   def find(selector)
     window = browser["window"]
     null = browser["null"]
     type = window["XPathResult"]["ANY_TYPE"]
-    # print window.document.xml
     result_set = window.document.evaluate selector, window.document, null, type, null
     nodes = []
     while n = result_set.iterateNext()
@@ -288,6 +307,11 @@ class Capybara::Driver::Envjs < Capybara::Driver::Base
     raise Capybara::TimeoutError if !fired && wait.nil?
   end
 
+  def execute_script(script)
+    browser["window"]["evaluate"].call(script)
+    nil
+  end
+
   def evaluate_script(script)
     browser["window"]["evaluate"].call(script)
   end

data/spec/driver/envjs_driver_spec.rb

@@ -10,7 +10,9 @@ describe Capybara::Driver::Envjs do
   end
 
   it_should_behave_like "driver"
-  it_should_behave_like "driver with javascript support"
   it_should_behave_like "driver with header support"
-  
+  it_should_behave_like "driver with status code support"
+  it_should_behave_like "driver with cookies support"
+  it_should_behave_like "driver with infinite redirect detection"
+  it_should_behave_like "driver with javascript support"
 end

data/spec/session/envjs_session_spec.rb

@@ -24,5 +24,5 @@ describe Capybara::Driver::Envjs do
   it_should_behave_like "session"
   it_should_behave_like "session with javascript support"
   it_should_behave_like "session with headers support"
-
+  it_should_behave_like "session with status code support"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: capybara-envjs
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Steven Parkes
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-02 00:00:00 -07:00
+date: 2010-07-05 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +26,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 1
         segments: 
         - 0
         - 3
-        - 8
-        version: 0.3.8
+        - 9
+        version: 0.3.9
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -42,12 +42,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 29
         segments: 
         - 0
         - 3
-        - 6
-        version: 0.3.6
+        - 7
+        version: 0.3.7
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -58,12 +58,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 3
         segments: 
         - 0
         - 5
-        - 3
-        version: 0.5.3
+        - 4
+        version: 0.5.4
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -90,12 +90,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 21
         segments: 
         - 2
         - 6
-        - 0
-        version: 2.6.0
+        - 1
+        version: 2.6.1
   type: :development
   version_requirements: *id005
 description: |-