tuev 0.4.2 → 0.5.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tuev (0.4.2)
+    tuev (0.5.0)
       selenium-client
 
 GEM

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.5.0

data/bin/tuev

@@ -28,9 +28,9 @@ opts = OptionParser.new do |opts|
           "set selenium host's port (default: #{options[:port]})") do |port|
     options[:port] = port || options[:port]
   end
-  
+
   # List of arguments.
-  opts.on("-b", "--browsers=x,y,z", Array, 
+  opts.on("-b", "--browsers=x,y,z", Array,
           "browsers where to run this file in (default #{options[:browsers].join(",")})") do |browsers|
     options[:browsers] = browsers || options[:browsers]
   end
@@ -56,7 +56,7 @@ opts = OptionParser.new do |opts|
 end
 
 begin
-  opts.parse!(ARGV) 
+  opts.parse!(ARGV)
 rescue => e
   if e.is_a?(OptionParser::MissingArgument) && e.args[0] == "-h"
     print opts
@@ -76,8 +76,7 @@ end
 
 errors = 0
 qunit_files.each do |file|
-  path = File.expand_path(file)
-  errors += QunitRunner.new(path, options).run
+  errors += QunitRunner.new(file, options).run
 end
 
 exit(errors)

data/lib/tuev/tuev.rb

@@ -108,6 +108,7 @@ class Tuev
         if files.empty?
           raise "could not find file matching '#{pattern}'"
         end
+
         files
       end
 
@@ -120,7 +121,7 @@ class Tuev
       end
 
 
-      file_list.map{|x| file_url(x)}
+      file_list.map{|x| file_url(x)}.uniq
     end
 
     def file_url(*relativ_path_parts)

data/lib/tuev/tuev_runner.rb

@@ -2,9 +2,33 @@ require "selenium/client"
 class QunitRunner
   def initialize(path, selenium_conf)
     @test_file = path
+
+    if local_file? && !(@test_file =~ /file:\/\//)
+      @test_file = "file://#{File.expand_path(@test_file)}"
+    end
+
     @selenium_conf = selenium_conf
   end
 
+  def local_file?
+    # it's a local file if it has not any protocoll or the file:// protcoll
+    !(@test_file =~ /:\/\//) || !!(@test_file =~ /file:\/\//)
+  end
+
+  def split_url
+    @test_file.match(/(?<host>.*:\/\/[^\/]+)(?<path>.*)$/)
+  end
+
+  # host & path as is needed below ...
+  def host
+    local_file? ? "file://" : split_url["host"]
+  end
+
+  def path
+    local_file? ? @test_file : split_url["path"]
+  end
+
+
   def run_in_browser(browser_string)
     begin
       Net::HTTP.new(@selenium_conf[:host], @selenium_conf[:port]).get2("/")
@@ -22,7 +46,7 @@ class QunitRunner
       :host => @selenium_conf[:host],
       :port => @selenium_conf[:port],
       :browser => browser_string,
-      :url => "file://",
+      :url => host,
       :timeout_in_second => 60
     )
 
@@ -38,7 +62,7 @@ class QunitRunner
 
     @selenium_conf[:browsers].each do |browser_id|
       run_in_browser(browser_id) do |browser|
-        browser.open "file://#{@test_file}"
+        browser.open path
         browser.wait_for_page_to_load "60000"
         puts "\ntesting on #{browser_id}: #{@test_file}\n\n"
         60.times{ break if (browser.is_element_present("id=qunit-testresult") rescue false); sleep 1 }

data/spec/qunit_runner_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+describe "QunitRunner" do
+  it "should detect correctly whether we have a local file or not" do
+    QunitRunner.new("http://example.com", "").local_file?.should == false
+    QunitRunner.new("https://example.com", "").local_file?.should == false
+    QunitRunner.new("/tmp/foo", "").local_file?.should == true
+    QunitRunner.new("file:///tmp/foo", "").local_file?.should == true
+    QunitRunner.new("../foo", "").local_file?.should == true
+  end
+
+  it "should detect the base host correctly" do
+    QunitRunner.new("http://example.com", "").host.should == "http://example.com"
+    QunitRunner.new("http://example.com/", "").host.should == "http://example.com"
+    QunitRunner.new("http://example.com/lirumlarum", "").host.should == "http://example.com"
+
+    QunitRunner.new("https://example.com", "").host.should == "https://example.com"
+    QunitRunner.new("https://example.com/", "").host.should == "https://example.com"
+    QunitRunner.new("https://example.com/lirumlarum", "").host.should == "https://example.com"
+
+    QunitRunner.new("/tmp/foo", "").host.should == "file://"
+    QunitRunner.new("file:///tmp/foo", "").host.should == "file://"
+    QunitRunner.new("../foo", "").host.should == "file://"
+  end
+
+  it "should detect the base path correctly" do
+    QunitRunner.new("http://example.com", "").path.should == ""
+    QunitRunner.new("http://example.com/", "").path.should == "/"
+    QunitRunner.new("http://example.com/lirumlarum", "").path.should == "/lirumlarum"
+
+    QunitRunner.new("https://example.com", "").path.should == ""
+    QunitRunner.new("https://example.com/", "").path.should == "/"
+    QunitRunner.new("https://example.com/lirumlarum", "").path.should == "/lirumlarum"
+
+    QunitRunner.new("/tmp/foo", "").path.should == "file:///tmp/foo"
+    QunitRunner.new("file:///tmp/foo", "").path.should == "file:///tmp/foo"
+    QunitRunner.new("../foo", "").path.should == "file://#{File.expand_path("../foo")}"
+  end
+
+end

data/spec/tuev_spec.rb

@@ -1,7 +1,4 @@
 require 'spec_helper'
 
 describe "Tuev" do
-  it "fails" do
-    Tuev.new.should != nil
-  end
 end

data/tuev.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tuev}
-  s.version = "0.4.2"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["kesselborn"]
-  s.date = %q{2011-05-04}
+  s.date = %q{2011-10-27}
   s.default_executable = %q{tuev}
   s.description = %q{...}
   s.email = %q{daniel@soundcloud.com}
@@ -43,6 +43,7 @@ Gem::Specification.new do |s|
     "lib/tuev/tuev_runner.rb",
     "spec/fixtures/fake_root/config/tuev.yml",
     "spec/fixtures/file_layout1.txt",
+    "spec/qunit_runner_spec.rb",
     "spec/spec_helper.rb",
     "spec/tuev_spec.rb",
     "tuev.gemspec",
@@ -54,6 +55,7 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.6.2}
   s.summary = %q{run qunit & selenium tests with rake}
   s.test_files = [
+    "spec/qunit_runner_spec.rb",
     "spec/spec_helper.rb",
     "spec/tuev_spec.rb"
   ]

metadata

@@ -2,7 +2,7 @@
 name: tuev
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors: 
 - kesselborn
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-04 00:00:00 +02:00
+date: 2011-10-27 00:00:00 +02:00
 default_executable: tuev
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -135,6 +135,7 @@ files:
 - lib/tuev/tuev_runner.rb
 - spec/fixtures/fake_root/config/tuev.yml
 - spec/fixtures/file_layout1.txt
+- spec/qunit_runner_spec.rb
 - spec/spec_helper.rb
 - spec/tuev_spec.rb
 - tuev.gemspec
@@ -153,7 +154,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2086859141094756435
+      hash: -3230019329448292206
       segments: 
       - 0
       version: "0"
@@ -171,5 +172,6 @@ signing_key:
 specification_version: 3
 summary: run qunit & selenium tests with rake
 test_files: 
+- spec/qunit_runner_spec.rb
 - spec/spec_helper.rb
 - spec/tuev_spec.rb