tuev 0.5.1 → 0.6.2

data/Gemfile.lock

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

data/Rakefile

@@ -30,6 +30,31 @@ Jeweler::Tasks.new do |gem|
 end
 Jeweler::RubygemsDotOrgTasks.new
 
+gemspec = 'tuev.gemspec'
+
+namespace :gem do
+  desc "Release a new version of the gem to the soundcloud repo"
+  task :screlease => [ 'version:bump:patch', 'gemspec', :deploy ]
+
+  desc "Deploys the built gem to the soundcloud gem repository: gems.soundcloud.com"
+  task :deploy do
+   Dir.chdir File.dirname(__FILE__)
+   spec = eval(IO.read(gemspec))
+   version = spec.version.to_s
+   raise "Version #{version} already deployed" if `git fetch --tags && git tag`.split(/\n/).include?(version)
+    sh <<-END
+      git commit -a --allow-empty -m 'Bump version to #{version}'
+      git tag -a #{version} -m 'Version #{version}'
+      git push
+      git push --tags
+      gem build #{gemspec} &&\
+      scp #{spec.file_name} soundcloud@gems.int.s-cloud.net:/srv/www/gems/gems &&\
+      ssh soundcloud@gems.int.s-cloud.net 'gem generate_index -d /srv/www/gems' &&\
+      rm #{spec.file_name}
+    END
+  end
+end
+
 require 'rake/testtask'
 Rake::TestTask.new(:spec) do |spec|
   spec.libs << 'lib' << 'spec'

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.6.2

data/bin/tuev

@@ -29,6 +29,11 @@ opts = OptionParser.new do |opts|
     options[:port] = port || options[:port]
   end
 
+  opts.on("-w", "--wait=SECONDS",
+          "do a wait after each test") do |port|
+    options[:port] = port || options[:port]
+  end
+
   # List of arguments.
   opts.on("-b", "--browsers=x,y,z", Array,
           "browsers where to run this file in (default #{options[:browsers].join(",")})") do |browsers|

data/lib/tuev/tuev_runner.rb

@@ -62,24 +62,54 @@ class QunitRunner
 
     @selenium_conf[:browsers].each do |browser_id|
       run_in_browser(browser_id) do |browser|
+        test_framework = ""
+
         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 }
+        120.times{
+          if  (browser.get_text("css=.jasmine_reporter") rescue false)
+            test_framework = "jasmine"
+            break
+          end
+
+          if (browser.get_text('id=qunit-testresult') != "Running..." rescue false)
+            test_framework = "qunit"
+            break
+          end
+
+          sleep 1
+        }
+
         sleep 1
-        if browser.get_eval("typeof(window.results)") == "undefined"
-          $stderr.puts "\tINFO: some lines of javascript will give you detailed testing output. For more info, see:"
-          $stderr.puts "\thttps://github.com/kesselborn/tuev/raw/master/contrib/tuev_qunit.js"
-          $stderr.puts
+
+        output =""
+        num_of_errors = 0
+        if test_framework == "qunit"
+          if browser.get_eval("typeof(window.results)") == "undefined"
+            $stderr.puts "\tINFO: some lines of javascript will give you detailed testing output. For more info, see:"
+            $stderr.puts "\thttps://github.com/kesselborn/tuev/raw/master/contrib/tuev_qunit.js"
+            $stderr.puts
+          else
+            puts browser.get_eval('window.results.join("\n")')
+            errors += browser.get_eval('window.errors.join("\n")')
+          end
+
+          output = browser.get_text('id=qunit-testresult')
+          num_of_errors += browser.get_text("css=#qunit-testresult .failed").to_i
         else
-          puts browser.get_eval('window.results.join("\n")')
-          errors += browser.get_eval('window.errors.join("\n")')
+          output = browser.get_eval('window.message')
+          junit_output = browser.get_eval('window.junitXML')
+          File.open("junit_results.xml", "w") do |f|
+            f << junit_output
+          end
+          num_of_errors += browser.get_eval('window.isSuccess') ? 0 : 1
         end
 
-        60.times{ break if (browser.get_text('id=qunit-testresult') != "Running..." rescue false); sleep 1 }
-        puts browser.get_text('id=qunit-testresult')
+        puts output
         puts
-        num_of_errors += browser.get_text("css=#qunit-testresult .failed").to_i
+
+        num_of_errors
       end
     end
 

data/spec/qunit_runner_spec.rb

@@ -10,6 +10,14 @@ describe "QunitRunner" do
   end
 
   it "should detect the base host correctly" do
+    QunitRunner.new("http://example.com:1234", "").host.should == "http://example.com:1234"
+    QunitRunner.new("http://example.com:1234/", "").host.should == "http://example.com:1234"
+    QunitRunner.new("http://example.com:1234/lirumlarum", "").host.should == "http://example.com:1234"
+
+    QunitRunner.new("https://example.com:1234", "").host.should == "https://example.com:1234"
+    QunitRunner.new("https://example.com:1234/", "").host.should == "https://example.com:1234"
+    QunitRunner.new("https://example.com:1234/lirumlarum", "").host.should == "https://example.com:1234"
+
     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"

data/tuev.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tuev}
-  s.version = "0.5.1"
+  s.version = "0.6.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["kesselborn"]
-  s.date = %q{2011-10-27}
+  s.date = %q{2011-12-20}
   s.default_executable = %q{tuev}
   s.description = %q{...}
   s.email = %q{daniel@soundcloud.com}

metadata

@@ -2,7 +2,7 @@
 name: tuev
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.1
+  version: 0.6.2
 platform: ruby
 authors: 
 - kesselborn
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-27 00:00:00 +02:00
+date: 2011-12-20 00:00:00 +01:00
 default_executable: tuev
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -154,7 +154,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3245969154304492143
+      hash: 3854787198987103234
       segments: 
       - 0
       version: "0"