celerity 0.9.1 → 0.9.2

data/.travis.yml

@@ -1,4 +1,4 @@
 rvm:
   - jruby
-before_script: 
+before_script:
   - git submodule update --init

data/README.rdoc

@@ -9,7 +9,7 @@
 
 Celerity is a JRuby library for easy and fast functional test automation for web applications.
 
-Celerity is a JRuby wrapper around HtmlUnit – a headless Java browser with 
+Celerity is a JRuby wrapper around HtmlUnit – a headless Java browser with
 JavaScript support. It provides a simple API for programmatic navigation through
 web applications. Celerity provides a superset of Watir's API.
 
@@ -20,7 +20,7 @@ web applications. Celerity provides a superset of Watir's API.
 * *Easy to use*: Simple API
 * *Portable*: Cross-platform thanks to the JVM
 * *Unintrusive*: No browser window interrupting your workflow (runs in background)
-	
+
 == Requirements
 
 * JRuby 1.2.0 or higher
@@ -29,18 +29,18 @@ web applications. Celerity provides a superset of Watir's API.
 == Install
 
     jruby -S gem install celerity
-  
+
 To always get the latest version, you should use Gemcutter as your primary gem source:
-  
+
     jruby -S gem install gemcutter
     jruby -S gem tumble
     jruby -S gem install celerity
-  
-  
+
+
 == Example
 
     require "rubygems"
-    require "celerity" 
+    require "celerity"
 
     browser = Celerity::Browser.new
     browser.goto('http://www.google.com')
@@ -48,7 +48,7 @@ To always get the latest version, you should use Gemcutter as your primary gem s
     browser.button(:name, 'btnG').click
 
     puts "yay" if browser.text.include? 'celerity.rubyforge.org'
-  
+
 == Source
 
 The source code is available on [GitHub](http://github.com/jarib/celerity/tree/master).
@@ -67,7 +67,7 @@ The source code is available on [GitHub](http://github.com/jarib/celerity/tree/m
 == License
 
 Celerity - JRuby wrapper for HtmlUnit
-Copyright (c) 2008-2011 FINN.no AS
+Copyright (c) 2008-2012 FINN.no AS
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

data/lib/celerity/collections.rb

@@ -152,7 +152,7 @@ module Celerity
   class H6s < ElementCollection
     def element_class; H6; end
   end
-  
+
   class Inses < ElementCollection
     def element_class; Ins; end
   end

data/lib/celerity/element_locator.rb

@@ -95,10 +95,10 @@ module Celerity
     def find_by_xpath(what)
       what = ".#{what}" if what[0].chr == "/"
       object = @object.getByXPath(what).to_a.first || return
-      
+
       return unless @idents.any? { |id| id.match?(object) }
-      
-      
+
+
       object
     end
 

data/lib/celerity/elements/non_control_elements.rb

@@ -80,7 +80,7 @@ module Celerity
   class H6 < NonControlElement
     TAGS = [ Identifier.new('h6') ]
   end
-  
+
   class Ins < NonControlElement
     TAGS = [ Identifier.new('ins') ]
   end

data/lib/celerity/elements/select_list.rb

@@ -47,7 +47,7 @@ module Celerity
         next unless matches_option?(option, value)
 
         selected ||= option.asText
-        option.click
+        option.click unless option.isSelected
       end
 
       unless selected

data/lib/celerity/short_inspect.rb

@@ -3,8 +3,14 @@ module Celerity
 
     def short_inspect(opts)
       if excluded_ivars = opts[:exclude]
+        if is_ruby19
+          excluded_ivars.map! { |ivar| ivar.to_sym }
+        end
         ivars = (instance_variables - excluded_ivars)
       elsif included_ivars = opts[:include]
+        if is_ruby19
+          included_ivars.map! { |ivar| ivar.to_sym }
+        end
         ivars = included_ivars
       else
         raise ArgumentError, "unknown arg: #{opts.inspect}"
@@ -14,7 +20,10 @@ module Celerity
       '#<%s:0x%s %s>' % [self.class.name, self.hash.to_s(16), ivars.join(" ")]
     end
 
-
+    private
+    def is_ruby19
+      RUBY_VERSION >= "1.9"
+    end
 
   end
-end
+end

data/lib/celerity/version.rb

@@ -1,3 +1,3 @@
 module Celerity
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
 end

data/spec/browser_authentication_spec.rb

@@ -5,8 +5,8 @@ describe "Browser" do
   describe "#credentials=" do
     it "sets the basic authentication credentials" do
       browser.goto(WatirSpec.host + "/authentication")
-      browser.text.should_not include("ok")
 
+      browser.text.should_not include("ok")
       browser.credentials = "foo:bar"
 
       browser.goto(WatirSpec.host + "/authentication")

data/spec/browser_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require File.expand_path("../watirspec/spec_helper", __FILE__)
 
 describe "Browser" do
@@ -269,15 +271,15 @@ describe "Browser" do
       browser.wait.should be_true
       alerts.should == 1
     end
-    
+
     it "should pass the correct args to webclient" do
       browser.webclient.should_receive(:waitForBackgroundJavaScript).with(10000)
       browser.wait
-      
+
       browser.webclient.should_receive(:waitForBackgroundJavaScript).with(3000)
-      browser.wait(3)      
+      browser.wait(3)
     end
-    
+
   end
 
   describe "#wait_while" do
@@ -285,7 +287,9 @@ describe "Browser" do
       browser.goto(WatirSpec.files + "/timeout.html")
       browser.div(:id, "change").click
       browser.wait_while { browser.contains_text("Trigger change") }
-      browser.div(:id, "change").text.should == "all done"
+      browser.wait_until {
+        browser.div(:id, "change").text == "all done"
+      }
     end
 
     it "returns the value returned from the block" do
@@ -349,9 +353,14 @@ describe "Browser" do
   describe "#status_code_exceptions" do
     it "raises status code exceptions if set to true" do
       browser.status_code_exceptions = true
-      lambda do
-        browser.goto(WatirSpec.host + "/doesnt_exist")
-      end.should raise_error(NavigationException)
+
+      begin
+        lambda {
+          browser.goto(WatirSpec.host + "/doesnt_exist")
+        }.should raise_error(NavigationException)
+      ensure
+        browser.status_code_exceptions = false
+      end
     end
   end
 
@@ -359,9 +368,11 @@ describe "Browser" do
     it "raises javascript exceptions if set to true" do
       browser.goto(WatirSpec.files + "/forms_with_input_elements.html")
       browser.javascript_exceptions = true
-      lambda do
-        browser.execute_script("no_such_function()")
-      end.should raise_error
+      begin
+        lambda { browser.execute_script("no_such_function()") }.should raise_error
+      ensure
+        browser.javascript_exceptions = false
+      end
     end
   end
 

data/spec/index_offset_spec.rb

@@ -4,18 +4,18 @@ describe "Celerity.index_offset" do
 
   # before :all do
   #   browser.goto(WatirSpec.files + "/non_control_elements.html")
-  #   
+  #
   #   Celerity.index_offset = 0
   # end
-  # 
+  #
   # it "returns the correct divs" do
   #   divs = browser.divs.to_a
-  #   
+  #
   #   divs.each_with_index do |div, idx|
   #     browser.div(:index, idx).id.should == div.id
   #   end
   # end
-  # 
+  #
   # after :all do
   #   Celerity.index_offset = 1
   # end

data/spec/link_spec.rb

@@ -12,5 +12,5 @@ describe "Link" do
       browser.link(:index, Celerity.index_offset + 1).absolute_url.should include("#{WatirSpec.files}/non_control_elements.html".gsub("file://", ''))
     end
   end
-  
+
 end

data/tasks/check.rake

@@ -1,9 +1,9 @@
 namespace :check do
-  
+
   desc 'Check syntax of all .rb files'
   task :syntax do
     failed = []
-    
+
     Dir['**/*.rb'].each do |f|
       begin
         eval("lambda do\n return true\n #{File.read f} \nend").call
@@ -13,12 +13,12 @@ namespace :check do
         failed <<  [f, e.message]
       end
     end
-    
+
     if failed.empty?
       puts "ok."
     else
       puts "\n\t#{failed.join("\n\t")}"
     end
   end
-  
+
 end

data/tasks/fix.rake

@@ -9,7 +9,7 @@ namespace :fix do
       s.gsub!(/\r?\n/, "\n")
       File.open(f, "w") { |io| io.write(s) }
     end
-  end  
+  end
 
   desc 'Remove trailing whitespace from all ruby files'
   task :trailing_whitespace do
@@ -21,5 +21,5 @@ namespace :fix do
       File.open(f, "w") { |io| io.write(s) }
     end
   end
-  
+
 end

data/tasks/jar.rake

@@ -8,11 +8,11 @@ namespace :jar do
     ruby_files = Dir['lib/**/*.rb']
     jar_files  = Dir['lib/**/*.jar']
     resources  = Dir['lib/celerity/resources/*']
-    
+
     rm_rf   target_dir if File.exist? target_dir
     mkdir   target_dir
     mkdir_p resource_dir = "#{target_dir}/celerity/resources"
-    
+
     sh "jrubyc", "-d", "lib", "-t", target_dir, *ruby_files
     resources.each { |extra| cp extra, resource_dir }
 
@@ -42,7 +42,7 @@ namespace :jar do
     rm_rf   target_dir if File.exist? target_dir
     mkdir   target_dir
     mkdir_p resource_dir = "#{target_dir}/celerity/resources"
-    
+
     sh "jrubyc", "-d", "lib", "-t", target_dir, *ruby_files
     resources.each { |extra| cp extra, resource_dir }
 

data/tasks/website.rake

@@ -4,7 +4,7 @@ namespace :website do
     host       = "jarib@rubyforge.org"
     remote_dir = "/var/www/gforge-projects/celerity"
     local_dir  = 'website'
-  
+
     sh %{rsync -rlgoDCv #{local_dir}/ #{host}:#{remote_dir}}
   end
 end

data/tasks/yard.rake

@@ -8,7 +8,7 @@ begin
       t.options += ["-o", "website/yard"]
     end
   end
-  
+
 rescue LoadError
   task :yardoc do
     abort "YARD is not available. In order to run yardoc, you must: sudo gem install yard"

data/website/benchmarks.html

@@ -41,7 +41,7 @@
                     <li><a href="http://celerity.rubyforge.org/svn/trunk/benchmark/bm_digg.rb">Scenario 3: Counting the number of "diggs" on digg.com's front page</a></li>
                     <li><a href="http://celerity.rubyforge.org/svn/trunk/benchmark/bm_input_locator.rb">Scenario 4: Locating different HTML input elements (local file)</a></li>
                 </ul>
-                
+
                 <h2>Results: Overview</h2>
                 <p>This table provides a quick overview. For more accurate numbers, see below.</p>
                 <table>

data/website/css/color.css

@@ -3,7 +3,7 @@
 }
 
 a {
-	
+
 }
 
 a:hover {
@@ -129,7 +129,7 @@ table th {
 }
 
 .project {
-	
+
 }
 
 .project img {

data/website/css/layout.css

@@ -77,7 +77,7 @@ table th, table td {
 #nav ul {
         height: 90px;
         overflow: auto;
-	text-align: center;	
+	text-align: center;
 }
 
 #nav ul li {

data/website/css/textmate.css

@@ -1,7 +1,7 @@
 /* Stylesheet generated from TextMate theme
  *
  * Mac Classic
- * 
+ *
  *
  */
 

metadata

@@ -2,7 +2,7 @@
 name: celerity
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors: 
   - Jari Bakken
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-22 00:00:00 Z
+date: 2012-01-12 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: rake
@@ -124,12 +124,12 @@ files:
   - lib/celerity/htmlunit.rb
   - lib/celerity/htmlunit/commons-codec-1.4.jar
   - lib/celerity/htmlunit/commons-collections-3.2.1.jar
-  - lib/celerity/htmlunit/commons-io-2.0.1.jar
-  - lib/celerity/htmlunit/commons-lang3-3.0.1.jar
+  - lib/celerity/htmlunit/commons-io-2.1.jar
+  - lib/celerity/htmlunit/commons-lang3-3.1.jar
   - lib/celerity/htmlunit/commons-logging-1.1.1.jar
-  - lib/celerity/htmlunit/cssparser-0.9.6-20110829.205617-3.jar
+  - lib/celerity/htmlunit/cssparser-0.9.7-20111123.050136-1.jar
   - lib/celerity/htmlunit/htmlunit-2.10-SNAPSHOT.jar
-  - lib/celerity/htmlunit/htmlunit-core-js-2.9.jar
+  - lib/celerity/htmlunit/htmlunit-core-js-2.10-SNAPSHOT.jar
   - lib/celerity/htmlunit/httpclient-4.1.2.jar
   - lib/celerity/htmlunit/httpcore-4.1.2.jar
   - lib/celerity/htmlunit/httpmime-4.1.2.jar
@@ -220,3 +220,4 @@ specification_version: 3
 summary: Celerity is a JRuby library for easy and fast functional test automation for web applications.
 test_files: []
 
+has_rdoc: