hanoi 0.0.2 → 0.0.3

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Luca Guidi
+Copyright (c) 2009 - 2010 Luca Guidi
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -105,6 +105,10 @@ You have probably noticed that `file_2_fixtures.html` is missing, this because *
 
 To solve the annoying start page issue run: `defaults write org.webkit.nightly.WebKit StartPageDisabled -bool YES`
 
+#### Webkit on Windows
+
+Webkit hasn't a default path on Windows, please put under `C:\Program Files`, or specify the `WEBKIT_HOME` env var.
+
 ## Acknowledgements
 
 The Ruby libraries of Hanoi are a customization of the `jsblib.rb`, courtesy of the [Prototype](http://prototypejs.org) team.
@@ -117,4 +121,4 @@ Hanoi runs a customized version of `QUnit`, courtesy of the [jQuery](http://jque
 
 ## Copyright
 
-(c) 2009 Luca Guidi - [http://lucaguidi.com](http://lucaguidi.com), released under the MIT license
+(c) 2009 - 2010 Luca Guidi - [http://lucaguidi.com](http://lucaguidi.com), released under the MIT license

data/Rakefile

@@ -5,7 +5,7 @@ require 'rake/testtask'
 require 'rake/rdoctask'
 require 'spec/rake/spectask'
 
-HANOI_VERSION = "0.0.2"
+HANOI_VERSION = "0.0.3"
 
 task :default => :spec
 

data/hanoi.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name               = "hanoi"
-  s.version            = "0.0.2"
-  s.date               = "2009-12-26"
+  s.version            = "0.0.3"
+  s.date               = "2010-01-03"
   s.summary            = "Automated jQuery tests with QUnit"
   s.author             = "Luca Guidi"
   s.email              = "guidi.luca@gmail.com"

data/lib/hanoi/browser.rb

@@ -1,8 +1,7 @@
 class Browser
   def supported?; true; end
-  def setup ; end
-  def open(url) ; end
-  def teardown ; end
+  def setup; end
+  def teardown; end
 
   def host
     require 'rbconfig'
@@ -14,13 +13,25 @@ class Browser
   end
 
   def windows?
-    host.include?('mswin')
+    /mswin|mingw/.match host
   end
 
   def linux?
     host.include?('linux')
   end
 
+  def installed?
+    if linux?
+      Kernel.system "which #{name}"
+    else
+      File.exist? path
+    end
+  end
+
+  def runnable?
+    supported? && installed?
+  end
+
   def visit(url)
     if macos?
       system("open -g -a #{path} '#{url}'")

data/lib/hanoi/browsers/chrome.rb

@@ -2,8 +2,8 @@ class Chrome < Browser
   def initialize(path = nil)
     @path = path || File.join(
       ENV['UserPath'] || ENV['UserProfile'] || "C:/Documents and Settings/Administrator",
-      "Local Settings",
-      "Application Data",
+      "AppData",
+      "Local",
       "Google",
       "Chrome",
       "Application",
@@ -15,6 +15,14 @@ class Chrome < Browser
     windows? || macos?
   end
 
+  def installed?
+    if macos?
+      File.exist?("/Applications/#{name}.app")
+    else
+      super
+    end
+  end
+
   def name
     "Google Chrome"
   end

data/lib/hanoi/browsers/internet_explorer.rb

@@ -6,7 +6,11 @@ class InternetExplorer < Browser
   def supported?
     windows?
   end
-  
+
+  def runnable?
+    supported?
+  end
+
   def visit(url)
     if windows?
       ie = WIN32OLE.new('InternetExplorer.Application')

data/lib/hanoi/browsers/konqueror.rb

@@ -26,12 +26,4 @@ class Konqueror < Browser
       copy "#{@@konqueror_config}.bak", @@konqueror_config, :preserve => true, :verbose => false
     end
   end
-
-  def visit(url)
-    system("kfmclient openURL #{url}")
-  end
-
-  def to_s
-    "Konqueror"
-  end
 end

data/lib/hanoi/browsers/webkit.rb

@@ -1,4 +1,8 @@
 class Webkit < Browser
+  def initialize(path = File.join(ENV['WEBKIT_HOME'] || ENV['ProgramFiles'] || 'C:\Program Files', 'Webkit', 'webkit.exe'))
+    @path = path
+  end
+
   def supported?
     macos? || windows?
   end

data/lib/hanoi/javascript_test_task.rb

@@ -29,7 +29,7 @@ class JavaScriptTestTask < ::Rake::TaskLib
 
       # run all combinations of browsers and tests
       @browsers.each do |browser|
-        if browser.supported?
+        if browser.runnable?
           t0 = Time.now
           test_suite_results = TestSuiteResults.new
 
@@ -47,7 +47,7 @@ class JavaScriptTestTask < ::Rake::TaskLib
           print test_suite_results
           browser.teardown
         else
-          puts "\nSkipping #{browser}, not supported on this OS."
+          puts "\nSkipping #{browser}, not supported on this OS or not installed."
         end
       end
 

data/spec/browser_spec.rb

@@ -13,7 +13,7 @@ describe "Browser" do
     method = case @browser.host
     when /darwin/
       :macos?
-    when /mswin/
+    when /mswin/, /mingw/
       :windows?
     when /linux/
       :linux?
@@ -21,4 +21,48 @@ describe "Browser" do
 
     @browser.send(method).should be_true
   end
-end
+
+  describe "Cross OS Browser", :shared => true do
+    it "should check if installed" do
+      File.should_receive(:exist?).and_return true
+      @browser.should be_installed
+
+      File.should_receive(:exist?).and_return false
+      @browser.should_not be_installed
+    end
+
+    it "should check if runnable" do
+      File.should_receive(:exist?).and_return true
+      @browser.should be_runnable
+
+      File.should_receive(:exist?).and_return false
+      @browser.should_not be_runnable
+    end
+  end
+
+  describe "Mac Os X" do
+    it_should_behave_like "Cross OS Browser"
+  end if macos?
+
+  describe "Windows" do
+    it_should_behave_like "Cross OS Browser"
+  end if windows?
+
+  describe "Linux" do
+    it "should check if installed" do
+      Kernel.should_receive(:system).with("which browser").and_return true
+      @browser.should be_installed
+
+      Kernel.should_receive(:system).with("which browser").and_return false
+      @browser.should_not be_installed
+    end
+
+    it "should check if runnable" do
+      Kernel.should_receive(:system).with("which browser").and_return true
+      @browser.should be_runnable
+
+      Kernel.should_receive(:system).with("which browser").and_return false
+      @browser.should_not be_runnable
+    end
+  end if linux?
+end

data/spec/browsers/chrome_spec.rb

@@ -34,7 +34,17 @@ describe "Chrome" do
     it_should_behave_like "Cross OS Chrome"
 
     it "should have a path" do
-      @browser.path.should == File.join(ENV['ProgramFiles'] || 'c:\Program Files', '\Mozilla Chrome\firefox.exe')
+      expected = File.join(
+        ENV['UserPath'] || ENV['UserProfile'] || "C:/Documents and Settings/Administrator",
+        "AppData",
+        "Local",
+        "Google",
+        "Chrome",
+        "Application",
+        "chrome.exe"
+      )
+
+      @browser.path.should == expected
     end
 
     it "should visit a given url" do

data/spec/browsers/internet_explorer_spec.rb

@@ -3,6 +3,7 @@ require File.join(File.dirname(__FILE__), "/../spec_helper")
 describe "InternetExplorer" do
   before :each do
     @browser = InternetExplorer.new
+    @url     = "http://localhost"
   end
 
   describe "Cross OS Internet Explorer", :shared => true do
@@ -28,13 +29,19 @@ describe "InternetExplorer" do
       @browser.should be_supported
     end
 
+    it "should be runnable" do
+      @browser.should be_runnable
+    end
+
     it "should setup" do
-      # TODO test on windows
-      # Kernel.expects(:require).with('win32ole')
+      Kernel.expects(:require).with('win32ole')
       lambda { @browser.setup }.should_not raise_error
     end
 
-    it "should visit a given url"
+    it "should visit a given url" do
+      Kernel.expects(:system).with("#{@browser.path} #{@url}")
+      @browser.visit(@url)
+    end
   end if windows?
 
   describe "Linux" do

data/spec/browsers/webkit_spec.rb

@@ -23,6 +23,10 @@ describe "Webkit" do
       @browser.setup
     end
 
+    it "should have a path" do
+      @browser.path.should == "/Applications/Webkit.app"
+    end
+
     it "should visit a given url" do
       url = "http://localhost"
       @browser.expects(:applescript).with(%(tell application "#{@browser.name}" to set URL of front document to "#{url}"))
@@ -42,6 +46,11 @@ describe "Webkit" do
       @browser.setup
     end
 
+    it "should have a path" do
+      expected = File.join(ENV['WEBKIT_HOME'] || ENV['ProgramFiles'] || 'C:\Program Files', 'Webkit', 'webkit.exe')
+      @browser.path.should == expected
+    end
+
     it "should visit a given url" do
       Kernel.expects(:system).with("#{@browser.path} #{@url}")
       @browser.visit(@url)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hanoi
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Luca Guidi
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-26 00:00:00 +01:00
+date: 2010-01-03 00:00:00 +01:00
 default_executable: 
 dependencies: []