capybara-envjs 0.1.6 → 0.4.0

data/CHANGELOG.rdoc

@@ -1,3 +1,10 @@
+=== 0.4.0 / 2010-10-24
+
+* Bring up to date with capy 0.4.0
+* Convert from hoe to bundler
+* make app_host/default_host dynamic
+* clean request parameters on redirect
+
 === 0.1.6 / 2010-07-05
 
 * scope select to node

data/lib/capybara/driver/envjs_driver.rb

@@ -22,18 +22,9 @@ if false # for testing ... but seems okay
 end
 
 class Capybara::Driver::Envjs < Capybara::Driver::Base
-  class Node < Capybara::Node
+  class Node < Capybara::Driver::Node
     def text
-      node.innerText
-    end
-
-    def [](name)
-      value = if name.to_sym == :class
-        node.className
-      else
-        node.getAttribute(name.to_s)
-      end
-      return value if value and not value.to_s.empty?
+      native.innerText
     end
 
     def [](name)
@@ -41,86 +32,73 @@ class Capybara::Driver::Envjs < Capybara::Driver::Base
       attr_name == "class" and attr_name = "className"
       case
       when 'select' == tag_name && 'value' == attr_name
-        if node['multiple']
-          all_unfiltered(".//option[@selected='selected']").map { |option| option.node.innerText  }
+        if native['multiple']
+          find(".//option[@selected='selected']").map { |option| option.native[:value] || option.native.innerText  }
         else
-          node.value
+          native.value
         end
-#      when 'input' == tag_name && 'checkbox' == type && 'checked' == attr_name
-#         node[attr_name] == 'checked' ? true : false
       else
-        node[attr_name]
+        native[attr_name]
       end
     end
 
     def value
       if tag_name == 'textarea'
-        node.innerText
+        native.innerText
       else
-        super
+        self[:value]
       end
     end
 
     def set(value)
-      case node.tagName
+      case native.tagName
       when "TEXTAREA"
-        node.innerText = value
+        native.innerText = value
       else
-        case node.getAttribute("type")
+        case native.getAttribute("type")
         when "checkbox", "radio"
-          node.click if node.checked != value
-        else; node.setAttribute("value",value)
+          native.click if native.checked != value
+        else; native.setAttribute("value",value)
         end
       end
     end
 
-    def select(option)
-      escaped = Capybara::XPath.escape(option)
-      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}"
+    def select_option
+      native.selected = true
     end
 
-    def unselect(option)
-      if !node['multiple']
-        raise Capybara::UnselectNotAllowed, "Cannot unselect option '#{option}' from single select box."
-      end
-
-      begin
-        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(', ')
-        raise Capybara::OptionNotFound, "No such option '#{option}' in this select box. Available options: #{options}"
+    def unselect_option
+      if !select_node['multiple']
+        raise Capybara::UnselectNotAllowed, "Cannot unselect option from single select box."
       end
+      native.removeAttribute('selected')
     end
 
     def click
-      _event(self,"MouseEvent",'click',true,true)
+      _event(self,"MouseEvents",'click',true,true, :button => 1)
     end
 
     def drag_to(element)
-      _event(self,"MouseEvent",'mousedown',true,true)
-      _event(element,"MouseEvent",'mousemove',true,true)
-      _event(element,"MouseEvent",'mouseup',true,true)
+      # distance stuff is arbitrary at this point, to make jquery.ui happy ...
+      _event(self,"MouseEvents",'mousedown',true,true, :button => 1, :pageX => 0, :pageY => 0)
+      _event(element,"MouseEvents",'mousemove',true,true, :button => 1, :pageX => 1, :pageY => 1)
+      _event(element,"MouseEvents",'mousemove',true,true, :button => 1, :pageX => 0, :pageY => 0)
+      _event(element,"MouseEvents",'mouseup',true,true, :button => 1, :pageX => 0, :pageY => 0)
     end
 
     def tag_name
-      node.tagName.downcase
+      native.tagName.downcase
     end
 
     def visible?
-      all_unfiltered("./ancestor-or-self::*[contains(@style, 'display:none') or contains(@style, 'display: none')]").empty?
+      find("./ancestor-or-self::*[contains(@style, 'display:none') or contains(@style, 'display: none')]").empty?
     end
 
-    def all_unfiltered selector
+    def find(locator)
       window = @driver.browser["window"]
       null = @driver.browser["null"]
       type = window["XPathResult"]["ANY_TYPE"]
-      result_set = window.document.evaluate selector, node, null, type, null
+      result_set = window.document.evaluate(locator, native, null, type, null)
       nodes = []
       while n = result_set.iterateNext()
         nodes << Node.new(@driver, n)
@@ -135,28 +113,42 @@ class Capybara::Driver::Envjs < Capybara::Driver::Base
 
     private
 
-    def _event(target,cls,type,bubbles,cancelable)
-      e = @driver.browser["document"].createEvent(cls);
+    # a reference to the select node if this is an option node
+    def select_node
+      find('./ancestor::select').first
+    end
+
+    def _event(target,cls,type,bubbles,cancelable,attributes = {})
+      e = @driver.browser["document"].createEvent(false && cls || ""); # disabled for now
       e.initEvent(type,bubbles,cancelable);
-      target.node.dispatchEvent(e);
+      attributes.each do |k,v|
+        e[k.to_s] = v
+      end
+      target.native.dispatchEvent(e);
     end
 
   end
 
   attr_reader :app
-  attr_reader :app_host
 
   def rack_test?
-    @rack_test
+    # p "rt?", app_host, default_url, (app_host == default_url)
+    app_host == default_url
   end
 
-  def initialize(app)
+  def default_host
+    (Capybara.default_host || "www.example.com")
+  end
 
-    default_host = @default_host = (Capybara.default_host || "www.example.com")
-    @default_url = "http://"+@default_host
-    @app_host = (ENV["CAPYBARA_APP_HOST"] || Capybara.app_host || @default_url)
+  def default_url
+    "http://"+default_host
+  end
+
+  def app_host
+    (ENV["CAPYBARA_APP_HOST"] || Capybara.app_host || default_url)
+  end
 
-    @rack_test = @app_host == @default_url
+  def initialize(app)
 
     if rack_test?
       require 'rack/test'
@@ -165,6 +157,7 @@ class Capybara::Driver::Envjs < Capybara::Driver::Base
         alias_method :response, :last_response
         alias_method :request, :last_request
         define_method :build_rack_mock_session do
+          # p default_host
           Rack::MockSession.new(app, default_host)
         end
       end
@@ -195,22 +188,26 @@ class Capybara::Driver::Envjs < Capybara::Driver::Base
       browser.master["connection"] = @connection = proc do |*args|
         xhr, responseHandler, data = *args
         url = xhr.url
-        params = data || {}
+        params = data || ""
         method = xhr["method"].downcase.to_sym
         e = env;
         if method == :post or method == :put
           e.merge! "CONTENT_TYPE" => xhr.headers["Content-Type"]
         end
+        e.merge! "HTTP_ACCEPT" => xhr.headers["Accept"] if xhr.headers["Accept"]
         if e["CONTENT_TYPE"] =~ %r{^multipart/form-data;}
           e["CONTENT_LENGTH"] ||= params.length
         end
         times = 0
         begin
+          # p url, app_host
           if url.index(app_host) == 0
             url.slice! 0..(app_host.length-1)
           end
-          # puts "send #{method} #{url} #{params}"
+          # p url
+          # puts "send #{method} #{url} #{params} #{e}"
           send method, url, params, e
+          # p "after" #, response
           while response.status == 302 || response.status == 301
             if (times += 1) > 5
               raise Capybara::InfiniteRedirectError, "redirected more than 5 times, check for infinite redirects."
@@ -222,7 +219,7 @@ class Capybara::Driver::Envjs < Capybara::Driver::Base
               url.slice! 0..(app_host.length-1)
             end
             # puts "redirect #{method} #{url} #{params}"
-            send method, url, params, e
+            send method, url, params, env
           end
         rescue Exception => e
           # print "got #{e} #{response.inspect}\n"
@@ -251,13 +248,14 @@ class Capybara::Driver::Envjs < Capybara::Driver::Base
     as_url = URI.parse path
     base = URI.parse app_host
     path = (base + as_url).to_s
+    # p path
     browser["window"].location.href = path
   end
 
   def current_url
     browser["window"].location.href
   end
-  
+
   def source
     browser["window"].document.__original_text__
   end
@@ -266,7 +264,7 @@ class Capybara::Driver::Envjs < Capybara::Driver::Base
     browser["window"].document.xml
   end
 
-  def cleanup!
+  def reset!
     clear_cookies
   end
 
@@ -323,7 +321,7 @@ class Capybara::Driver::Envjs < Capybara::Driver::Base
       @_browser = Johnson::Runtime.new :size => Integer(ENV["JOHNSON_HEAP_SIZE"] || 0x4000000)
       @_browser.extend Envjs::Runtime
     end
-    
+
     @_browser
   end
 
@@ -344,3 +342,7 @@ private
   end
 
 end
+
+Capybara.register_driver :envjs do |app|
+  Capybara::Driver::Envjs.new(app)
+end

data/lib/capybara/envjs/version.rb

@@ -0,0 +1,5 @@
+module Capybara
+  module Envjs
+    VERSION = "0.4.0"
+  end
+end

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 require 'rubygems'
+require 'bundler/setup'
 require 'capybara/envjs'
 
 spec_dir = nil
@@ -10,3 +11,7 @@ $:.detect do |dir|
 end
 
 require File.join(spec_dir,"spec_helper")
+
+RSpec.configure do |c|
+  # c.filter_run :focus => true
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: capybara-envjs
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 6
-  version: 0.1.6
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Steven Parkes
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-05 00:00:00 -07:00
+date: 2010-10-24 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,14 +24,14 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 15
         segments: 
         - 0
-        - 3
-        - 9
-        version: 0.3.9
+        - 4
+        - 0
+        version: 0.4.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -51,19 +51,18 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rack-test
+  name: bundler
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 15
         segments: 
+        - 1
         - 0
-        - 5
-        - 4
-        version: 0.5.4
+        version: "1.0"
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -72,36 +71,47 @@ dependencies:
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 3
         segments: 
-        - 1
-        - 3
+        - 2
         - 0
-        version: 1.3.0
+        version: "2.0"
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: hoe
+  name: rack-test
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 3
         segments: 
-        - 2
-        - 6
-        - 1
-        version: 2.6.1
+        - 0
+        - 5
+        - 4
+        version: 0.5.4
   type: :development
   version_requirements: *id005
-description: |-
-  capybara-envjs is a {Capybara}[http://github.com/jnicklas/capybara] driver for the envjs gem ({GitHub}[http://github.com/smparkes/env-js],
-  {rubygems.org}[http://rubygems.org/gems/envjs]).
-  It is similar to Capybara's rack-test driver in that it runs tests against your rack application directly but fully supports javascript in your application.
+- !ruby/object:Gem::Dependency 
+  name: sinatra
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
+  type: :development
+  version_requirements: *id006
+description: capybara-envjs is a Capybara driver for the envjs gem. It is similar to Capybara's rack-test driver in that it runs tests against your rack application directly but fully supports javascript in your application.
 email: 
 - smparkes@smparkes.net
 executables: []
@@ -109,22 +119,17 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- History.txt
-- Manifest.txt
-- CHANGELOG.rdoc
 - README.rdoc
 files: 
-- CHANGELOG.rdoc
-- History.txt
-- Manifest.txt
-- README.rdoc
-- Rakefile
 - lib/capybara/driver/envjs_driver.rb
-- lib/capybara/envjs.rb
 - lib/capybara/envjs/cucumber.rb
+- lib/capybara/envjs/version.rb
+- lib/capybara/envjs.rb
 - spec/driver/envjs_driver_spec.rb
 - spec/session/envjs_session_spec.rb
 - spec/spec_helper.rb
+- README.rdoc
+- CHANGELOG.rdoc
 has_rdoc: true
 homepage: http://github.com/smparkes/capybara-envjs
 licenses: []
@@ -159,6 +164,6 @@ rubyforge_project: capybara-envjs
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: capybara-envjs is a {Capybara}[http://github.com/jnicklas/capybara] driver for the envjs gem ({GitHub}[http://github.com/smparkes/env-js], {rubygems.org}[http://rubygems.org/gems/envjs])
+summary: Capybara driver for envjs
 test_files: []
 

data/History.txt

@@ -1,5 +0,0 @@
-=== 0.1.0 20010-02-25
-
-* 1 major enhancement:
-  * Initial release
-

data/Manifest.txt

@@ -1,11 +0,0 @@
-CHANGELOG.rdoc
-History.txt
-Manifest.txt
-README.rdoc
-Rakefile
-lib/capybara/driver/envjs_driver.rb
-lib/capybara/envjs.rb
-lib/capybara/envjs/cucumber.rb
-spec/driver/envjs_driver_spec.rb
-spec/session/envjs_session_spec.rb
-spec/spec_helper.rb

data/Rakefile

@@ -1,28 +0,0 @@
-# -*- Mode: Ruby -*-
-
-require 'rubygems'
-
-gem 'hoe', '>= 2.5'
-require 'hoe'
-
-Hoe.plugin 
-Hoe.plugin :debugging, :doofus, :git
-Hoe.plugins.delete :rubyforge
-
-Hoe.spec 'capybara-envjs' do
-  developer 'Steven Parkes', 'smparkes@smparkes.net'
-  self.version = "0.1.6"
-
-  self.readme_file      = 'README.rdoc'
-  self.extra_rdoc_files = Dir['*.rdoc']
-
-  self.extra_deps = [
-    ['capybara', '>= 0.3.9'],
-    ['envjs', '>= 0.3.7']
-  ]
-
-  self.extra_dev_deps = [
-    ['rack-test', '>= 0.5.4'],
-    ['rspec', '>= 1.3.0']
-  ]
-end