capybara-envjs 0.1.2 → 0.1.3

data/CHANGELOG.rdoc

@@ -1,3 +1,10 @@
+=== 0.1.3 / 2010-05-19
+
+* alway return headers from doc ... the rack request might not be current
+* handle off-site scripts, pass redirects to envjs
+* match escaping from capy 0.3.8
+* don't assume cucumber if no world ... some people had trouble
+
 === 0.1.2 / 2010-04-22
 
 * Spelling corrections in the README.rdoc [Brian Cardarella]

data/Rakefile

@@ -9,14 +9,14 @@ Hoe.plugins.delete :rubyforge
 
 Hoe.spec 'capybara-envjs' do
   developer 'Steven Parkes', 'smparkes@smparkes.net'
-  self.version = "0.1.2"
+  self.version = "0.1.3"
 
   self.readme_file      = 'README.rdoc'
   self.extra_rdoc_files = Dir['*.rdoc']
 
   self.extra_deps = [
-    ['capybara', '>= 0.3.6'],
-    ['envjs', '>= 0.3.0']
+    ['capybara', '>= 0.3.8'],
+    ['envjs', '>= 0.3.5']
   ]
 
   self.extra_dev_deps = [

data/lib/capybara/driver/envjs_driver.rb

@@ -67,7 +67,8 @@ class Capybara::Driver::Envjs < Capybara::Driver::Base
     end
 
     def select(option)
-      option_node = all_unfiltered("//option[text()='#{option}']") || all_unfiltered("//option[contains(.,'#{option}')]")
+      escaped = Capybara::XPath.escape(option)
+      option_node = all_unfiltered("//option[text()=#{escaped}]") || all_unfiltered("//option[contains(.,#{escaped})]")
       option_node[0].node.selected = true
     rescue Exception => e
       options = all_unfiltered(".//option").map { |o| "'#{o.text}'" }.join(', ')
@@ -80,7 +81,8 @@ class Capybara::Driver::Envjs < Capybara::Driver::Base
       end
 
       begin
-        option_node = (all_unfiltered("//option[text()='#{option}']") || all_unfiltered("//option[contains(.,'#{option}')]")).first
+        escaped = Capybara::XPath.escape(option)
+        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(', ')
@@ -164,8 +166,14 @@ class Capybara::Driver::Envjs < Capybara::Driver::Base
       browser.master["load"] = proc do |*args|
         if args.size == 2 and args[1].to_s != "[object split_global]"
           file, window = *args
-          get(file, {}, env)
-          window["evaluate"].call response.body
+          body = nil
+          if file.index(app_host) == 0
+            get(file, {}, env)
+            body = response.body
+          else
+            body = Net::HTTP.get(URI.parse(file))
+          end
+          window["evaluate"].call body
         else
           master_load.call *args
         end
@@ -208,6 +216,8 @@ class Capybara::Driver::Envjs < Capybara::Driver::Base
         xhr.status = response.status
         xhr.responseText = response.body
         xhr.readyState = 4
+        url = app_host+url
+        xhr.__url = url
         responseHandler.call
       end
     end
@@ -242,7 +252,7 @@ class Capybara::Driver::Envjs < Capybara::Driver::Base
   end
 
   def response_headers
-    rack_test? ? response.headers : Headers.new(browser["window"]["document"]["__headers__"])
+    Headers.new(browser["window"]["document"]["__headers__"])
   end
 
   def find(selector)

data/lib/capybara/envjs.rb

@@ -1,6 +1,6 @@
 require 'capybara'
 require 'capybara/driver/envjs_driver'
 
-if Object.const_defined? :Cucumber
+if Object.const_defined? :Cucumber and Object.respond_to? :World
   require 'capybara/envjs/cucumber'
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Steven Parkes
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-22 00:00:00 -07:00
+date: 2010-05-19 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,8 +27,8 @@ dependencies:
         segments: 
         - 0
         - 3
-        - 6
-        version: 0.3.6
+        - 8
+        version: 0.3.8
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -41,8 +41,8 @@ dependencies:
         segments: 
         - 0
         - 3
-        - 0
-        version: 0.3.0
+        - 5
+        version: 0.3.5
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency