jasmine-sauce 0.2.0.alpha1 → 0.2.0.alpha2

data/Rakefile

@@ -8,10 +8,12 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
+desc 'Build the gem'
 task :build do
   system "gem build jasmine-sauce.gemspec"
 end
 
+desc 'Push gem to rubygems.org'
 task :push => :build do
   system "gem push `ls *.gem | sort | tail -n 1`"
 end

data/lib/generators/sauce/jasmine/jasmine_generator.rb

@@ -10,7 +10,6 @@ module Sauce
       end
       
       def copy
-        directory "spec"
         directory "lib"
       end
     end

data/lib/sauce/jasmine/config.rb

@@ -4,18 +4,15 @@ require 'sauce/jasmine/selenium_driver'
 module Sauce
   module Jasmine
     class Config < ::Jasmine::Config
-      attr_accessor :sauce_connect, :os, :browser, :browser_version
-      attr_writer :base_url
+      attr_accessor :tunnel_domain
 
       def initialize
         sauce_connect = true
+        @tunnel_domain = "#{rand(10000)}.jasmine.test"
       end
 
-      def start
-        start_jasmine_server if sauce_connect
-        @client = Sauce::Jasmine::SeleniumDriver.new(browser, os, browser_version, jasmine_host,
-                                                     @jasmine_server_port, sauce_connect, @base_url)
-        @client.connect
+      def quiet_tunnel?
+        true
       end
     end
   end

data/lib/sauce/jasmine/jasmine-sauce.rake

@@ -1,13 +1,11 @@
-require 'rspec'
-require 'rspec/core/rake_task'
+require 'sauce/jasmine'
 
 namespace :jasmine do
   namespace :ci do
     desc 'Run Jasmine tests in the cloud'
-    RSpec::Core::RakeTask.new(:sauce) do |t|
-      t.rspec_opts = ["--colour", "--format", "progress"]
-      t.verbose = true
-      t.pattern = ['spec/javascripts/support/jasmine_sauce_runner.rb']
+    task :sauce do
+      runner = Sauce::Jasmine::Runner.new
+      runner.run
     end
   end
 end

data/lib/sauce/jasmine/runner.rb

@@ -0,0 +1,93 @@
+module Sauce
+  module Jasmine
+    class Runner
+      def initialize
+        @config = Config.new
+        @server = Server.new(@config)
+      end
+
+      def run
+        setup
+        begin
+          run_tests
+        ensure
+          teardown
+        end
+      end
+
+      def setup
+        @server.start
+        puts "Setting up Sauce Connect..."
+        @tunnel = Sauce::Connect.new(:domain => @config.tunnel_domain,
+                                         :host => @server.host,
+                                         :port => @server.port,
+                                         :quiet => @config.quiet_tunnel?)
+        @tunnel.wait_until_ready
+        puts "Sauce Connect ready"
+      end
+      
+      def run_tests
+        puts "running tests..."
+        browsers = Sauce::Config.new.browsers
+        results = {}
+
+        threads = browsers.map do |browser_spec|
+          browser_string = browser_spec.join('/')
+          Thread.new do
+            begin
+              result = run_tests_in_browser(*browser_spec)
+              puts "Suite finished on #{browser_string}"
+              Thread.exclusive do
+                results[browser_string] << result
+              end
+            rescue => e
+              results[browser_string] = e
+            end
+          end
+        end
+        threads.each(&:join)
+
+        success = results.all? do |run_result|
+          if run_result.respond_to? :values
+            run_result.values.all? {|suite_result| suite_result['result'] == "passed"}
+          else # exception
+            false
+          end
+        end
+        if success
+          puts "Success!"
+        else
+          puts "Failure:"
+          results.each do |browser_string, result|
+            puts "#{browser_string}:"
+            p result
+            puts
+            puts
+          end
+          at_exit { exit!(1) }
+        end
+      end
+
+      def teardown
+        puts "Shutting down Sauce Connect..."
+        @tunnel.disconnect
+        puts "Sauce Connect shut down"
+      end
+
+      def run_tests_in_browser(os, browser, browser_version)
+        driver = SeleniumDriver.new(os, browser, browser_version, @config.tunnel_domain)
+        driver.connect
+        begin
+          while !driver.tests_have_finished?
+            sleep 1.0
+          end
+          result = driver.test_results
+        ensure
+          driver.disconnect
+          return result
+        end
+      end
+    end
+  end
+end
+

data/lib/sauce/jasmine/selenium_driver.rb

@@ -3,37 +3,26 @@ require 'jasmine/selenium_driver'
 module Sauce
   module Jasmine
     class SeleniumDriver < ::Jasmine::SeleniumDriver
-      def initialize(browser, os, version, host, port, sauce_connect, base_url = nil)
+      def initialize(os, browser, browser_version, domain)
         host = host[7..-1] if host =~ /^http:\/\//
-        @host = host
-        @port = port
-        @sauce_connect = sauce_connect
-        base_url ||= "#{rand(10000)}.jasmine.test"
+          base_url = "http://#{domain}"
         @driver = Sauce::Selenium.new(:browser => browser,
                                       :os => os,
-                                      :browser_version => version,
+                                      :browser_version => browser_version,
                                       :browser_url => base_url,
-                                      :job_name => "Jasmine",
-                                      :'record-video' => true,
-                                      :'record-screenshots' => true)
+                                      :job_name => "Jasmine")
       end
 
-      def connect
-        if @sauce_connect
-          puts "Setting up Sauce Connect..."
-          @connection = Sauce::Connect.new(:domain => @tunnel_domain,
-                                           :host => @host,
-                                           :port => @port,
-                                           :quiet => true)
-          @connection.wait_until_ready
-          puts "Sauce Connect ready."
-        end
-        super
+      def tests_have_finished?
+        eval_js("jsApiReporter && jsApiReporter.finished")
       end
 
-      def disconnect
-        @driver.stop
-        @connection.disconnect if @connection
+      def test_suites
+        eval_js("var result = jsApiReporter.suites(); if (window.Prototype && Object.toJSON) { Object.toJSON(result) } else { JSON.stringify(result) }")
+      end
+
+      def test_results
+        eval_js("var result = jsApiReporter.results(); if (window.Prototype && Object.toJSON) { Object.toJSON(result) } else { JSON.stringify(result) }")
       end
     end
   end

data/lib/sauce/jasmine/server.rb

@@ -0,0 +1,25 @@
+module Sauce
+  module Jasmine
+    class Server
+      attr_reader :port, :host
+
+      def initialize(config)
+        @config = config
+        @host = "127.0.0.1"
+      end
+
+      def start
+        @port = ::Jasmine::find_unused_port
+        Thread.new do
+          handler = Rack::Handler.default
+          handler.run ::Jasmine.app(@config), :Port => @port, :AccessLog => []
+        end
+        ::Jasmine::wait_for_listener(@port, "jasmine server")
+      end
+
+      def stop
+        # nothing, yet
+      end
+    end
+  end
+end

data/lib/sauce/jasmine.rb

@@ -1 +1,3 @@
 require 'sauce/jasmine/config'
+require 'sauce/jasmine/server'
+require 'sauce/jasmine/runner'

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: jasmine-sauce
 version: !ruby/object:Gem::Version 
-  hash: -3702664322
+  hash: -3702664328
   prerelease: 6
   segments: 
   - 0
   - 2
   - 0
   - alpha
-  - 1
-  version: 0.2.0.alpha1
+  - 2
+  version: 0.2.0.alpha2
 platform: ruby
 authors: 
 - Eric Allen
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-23 00:00:00 -07:00
+date: 2011-03-24 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,12 +28,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 91
+        hash: 85
         segments: 
         - 0
-        - 16
-        - 2
-        version: 0.16.2
+        - 18
+        - 1
+        version: 0.18.1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -67,10 +67,11 @@ files:
 - Rakefile
 - lib/generators/sauce/jasmine/jasmine_generator.rb
 - lib/generators/sauce/jasmine/templates/lib/tasks/jasmine-sauce.rake
-- lib/generators/sauce/jasmine/templates/spec/javascripts/support/jasmine_sauce_runner.rb
 - lib/sauce/jasmine/config.rb
 - lib/sauce/jasmine/jasmine-sauce.rake
+- lib/sauce/jasmine/runner.rb
 - lib/sauce/jasmine/selenium_driver.rb
+- lib/sauce/jasmine/server.rb
 - lib/sauce/jasmine.rb
 has_rdoc: true
 homepage: http://github.com/saucelabs/jasmine-sauce

data/lib/generators/sauce/jasmine/templates/spec/javascripts/support/jasmine_sauce_runner.rb

@@ -1,64 +0,0 @@
-require 'rubygems'
-require 'jasmine'
-require 'sauce/jasmine'
-
-jasmine_config_overrides = File.expand_path(File.join(File.dirname(__FILE__), 'jasmine_config.rb'))
-require jasmine_config_overrides if File.exist?(jasmine_config_overrides)
-
-$jasmine_config = Sauce::Jasmine::Config.new
-$jasmine_config.sauce_connect = false
-
-$tunnel_domain = "#{rand(10000)}.jasmine.test"
-
-def start_server(port = 8888)
-  handler = Rack::Handler.default
-  handler.run Jasmine.app($jasmine_config), :Port => port, :AccessLog => []
-end
-
-def start_jasmine_server
-  jasmine_server_port = Jasmine::find_unused_port
-  Thread.new do
-    start_server(jasmine_server_port)
-  end
-  Jasmine::wait_for_listener(jasmine_server_port, "jasmine server")
-  puts "jasmine server started."
-  return jasmine_server_port
-end
-
-port = start_jasmine_server
-
-
-puts "Setting up Sauce Connect..."
-@connection = Sauce::Connect.new(:domain => $tunnel_domain,
-                                 :host => "127.0.0.1",
-                                 :port => port,
-                                 :quiet => true)
-@connection.wait_until_ready
-puts "Sauce Connect ready!"
-
-builders = []
-
-RSpec.configuration.after(:suite) do
-  builders.each do |builder|
-    builder.stop
-  end
-end
-
-Sauce::Config.new.browsers.each do |os, browser, browser_version|
-  config = Sauce::Jasmine::Config.new
-  config.sauce_connect = false
-  config.os = os
-  config.browser = browser
-  config.browser_version = browser_version
-
-  config.base_url = "http://#{$tunnel_domain}"
-  spec_builder = Jasmine::SpecBuilder.new(config)
-  builders << spec_builder
-
-  spec_builder.start
-  spec_builder.declare_suites
-end
-
-at_exit do
-  puts "\nShutting down Sauce Connect..."
-end