rally-jasmine 1.2.0.12 → 1.2.0.18

data/.gitignore

@@ -1,3 +1,4 @@
+*.gem
 .idea
 pkg
 bin

data/lib/jasmine/base.rb

@@ -1,5 +1,6 @@
 require 'socket'
 require 'erb'
+require 'thin'
 
 module Jasmine
   # this seemingly-over-complex method is necessary to get an open port on at least some of our Macs
@@ -34,7 +35,7 @@ module Jasmine
     time_out_at = Time.now + seconds_to_wait
     until server_is_listening_on "localhost", port
       sleep 0.1
-      puts "Waiting for #{name} on #{port}..."
+      $stderr.puts "Waiting for #{name} on #{port}..."
       raise "#{name} didn't show up on port #{port} after #{seconds_to_wait} seconds." if Time.now > time_out_at
     end
   end

data/lib/jasmine/run.html.erb

@@ -15,33 +15,105 @@
   <script type="text/javascript">
     //TODO: make this a js file that gets passed in, then iterate over only js_files
     var jsApiReporter;
-    (function() {
-      var jasmineEnv = jasmine.getEnv();
+    (function () {
+        var jasmineEnv = jasmine.getEnv();
 
-      jsApiReporter = new jasmine.JsApiReporter();
-      var htmlReporter = new jasmine.HtmlReporter();
+        function getSpecName(spec) {
+            var nodes = [spec.description];
+            var suite = spec.suite;
 
-      jasmineEnv.addReporter(jsApiReporter);
-      jasmineEnv.addReporter(htmlReporter);
+            while(suite) {
+              nodes.push(suite.description);
+              suite = suite.parentSuite;
+            }
 
-      jasmineEnv.specFilter = function(spec) {
-        return htmlReporter.specFilter(spec);
-      };
+            return nodes.reverse().join(':');
+        }
 
-      var currentWindowOnload = window.onload;
+        var start, end;
+        var specResults = [];
+        var specFailures = [];
+        var latestSpecToFinish = 'none';
+    
+        var realReportSpecResults = jasmine.JsApiReporter.prototype.reportSpecResults;
+        var realReportRunnerStarting = jasmine.JsApiReporter.prototype.reportRunnerStarting;
+        var realReportRunnerResults = jasmine.JsApiReporter.prototype.reportRunnerResults;
+        var realSummarizeResult_ = jasmine.JsApiReporter.prototype.summarizeResult_;
+    
+        jasmine.JsApiReporter.prototype.reportSpecResults = function(spec) {
+            realReportSpecResults.call(this, spec);
 
-      window.onload = function() {
-        if (currentWindowOnload) {
-          currentWindowOnload();
-        }
-        execJasmine();
-      };
+            var specName = getSpecName(spec);
+            latestSpecToFinish = specName;
+
+            if(spec.results().failedCount > 0) {
+                specFailures.push(specName);
+                specResults.push('F');
+            } else {
+                specResults.push('.');
+            }
+        };
+    
+        jasmine.JsApiReporter.prototype.reportRunnerStarting = function() {
+            realReportRunnerStarting.apply(this, arguments);
+            start = new Date();
+        };
+    
+        jasmine.JsApiReporter.prototype.reportRunnerResults = function() {
+            realReportRunnerResults.apply(this, arguments);
+            end = new Date();
+        };
 
-      function execJasmine() {
-        jasmineEnv.execute();
-      }
+        jasmine.JsApiReporter.prototype.summarizeResult_ = function(result) {
+            if(result) {
+                return realSummarizeResult_.call(this, result);
+            }
+        };
+    
+        jsApiReporter = new jasmine.JsApiReporter();
 
-    })();
+        jsApiReporter.getLatestStatus = function() {
+            var results = {
+                count: specResults.length,
+                failures: specFailures,
+                results: specResults.join('')
+            };
+            // var results = '"' + specResults.length + ',' + JSON.stringify(specFailures).replace(/"/g, '\\"') + ',' + specResults.join('') + '"';
+            specResults = [];
+            specFailures = [];
+            return JSON.stringify(results);
+        };
+
+        jsApiReporter.getLatestSpecToHaveFinished = function() {
+            return '"' + latestSpecToFinish + '"';
+        };
+    
+        jsApiReporter.getDurationForRun = function() {
+            return end - start;
+        };
+    
+        var htmlReporter = new jasmine.HtmlReporter();
+    
+        jasmineEnv.addReporter(jsApiReporter);
+        jasmineEnv.addReporter(htmlReporter);
+        jasmineEnv.specFilter = function (spec) {
+            return htmlReporter.specFilter(spec);
+        };
+    
+        var currentWindowOnload = window.onload;
+    
+        window.onload = function () {
+            if (currentWindowOnload) {
+                currentWindowOnload();
+            }
+            execJasmine();
+        };
+    
+        function execJasmine() {
+            jasmineEnv.execute();
+        }
+    
+    })();  
   </script>
 
   <% js_files.each do |js_file| %>
@@ -53,3 +125,4 @@
 <div id="jasmine_content"></div>
 </body>
 </html>
+

data/lib/jasmine/runners/http.rb

@@ -28,6 +28,7 @@ module Jasmine
         end
 
         @suites = eval_js("var result = jsApiReporter.suites(); if (window.Prototype && Object.toJSON) { return Object.toJSON(result) } else { return JSON.stringify(result) }")
+        @total_spec_count = eval_js("return jasmine.getEnv().currentRunner().specs().length;")
       end
 
       def results_hash
@@ -52,14 +53,79 @@ module Jasmine
       end
 
       def wait_for_suites_to_finish_running
-        puts "Waiting for suite to finish in browser ..."
+        $stderr.puts "Waiting for suite to finish in browser (#{@total_spec_count} specs)..."
+        @spec_status = ''
+        @finished_spec_count = 0
+        @output_spec_count = 0
         while !eval_js('return jsApiReporter.finished') do
-          sleep 0.1
+
+          return if @unresponsive_script_detected
+
+          sleep 2
+          status = eval_js('return jsApiReporter.getLatestStatus()')
+          output_status(status)
+        end
+
+        status = eval_js('return jsApiReporter.getLatestStatus()')
+        output_status(status, true)
+
+        duration = eval_js('return jsApiReporter.getDurationForRun()')
+
+        $stderr.puts "\nSuites took #{duration/1000} seconds\n"
+
+      end
+
+      def output_status(chunk, flush = false)
+        return unless chunk
+        status_count = chunk['count']
+        failures = chunk['failures']
+        status = chunk['results']
+        @finished_spec_count += status_count
+        @spec_status += status
+        while @spec_status.size >= 100
+          @output_spec_count += 100
+          $stderr.puts @spec_status[0...100] + finished_of_total_count
+          @spec_status = @spec_status[100..-1]
+        end
+
+        if flush && @spec_status.size > 0
+          @output_spec_count = @finished_spec_count
+          $stderr.puts @spec_status + finished_of_total_count
+          @spec_status = ''
         end
+
+        failures.each { |f| $stderr.puts f }
+      end
+
+      def finished_of_total_count
+        " (#{@output_spec_count} of #{@total_spec_count})"
       end
 
       def eval_js(script)
-        @client.eval_js(script)
+        begin
+          return @client.eval_js(script)
+        rescue Selenium::WebDriver::Error::UnhandledAlertError => e
+          handle_unexpected_alert e
+        end
+      end
+
+      def handle_unexpected_alert(e)
+        alert_text = @client.get_alert_text
+        @client.close_alert
+
+        $stderr.puts <<-ALERT_MSG
+        Unexpected alert: "#{alert_text}"
+
+        #{e.message}
+
+        happened near:
+        #{@client.eval_js('return jsApiReporter.getLatestSpecToHaveFinished()')}
+
+            
+        ALERT_MSG
+
+        @unresponsive_script_detected = e.message =~ /stopped responding/
+        return nil
       end
 
       def json_generate(obj)
@@ -69,3 +135,4 @@ module Jasmine
     end
   end
 end
+

data/lib/jasmine/selenium_driver.rb

@@ -63,6 +63,7 @@ module Jasmine
       else
         url = @http_address
       end
+      @driver.manage.window.resize_to(1280, 1024)
       @driver.navigate.to url
       url
     end
@@ -77,6 +78,14 @@ module Jasmine
       JSON.parse("{\"result\":#{result}}", :max_nesting => false)["result"]
     end
 
+    def close_alert
+      @driver.switch_to.alert.accept rescue nil
+    end
+
+    def get_alert_text
+      @driver.switch_to.alert.text rescue nil
+    end
+
     def json_generate(obj)
       JSON.generate(obj)
     end

data/lib/jasmine/server.rb

@@ -6,14 +6,13 @@ module Jasmine
     end
 
     def start
-      if Jasmine::Dependencies.legacy_rack?
-        handler = Rack::Handler.get('webrick')
-        handler.run(@application, :Port => @port, :AccessLog => [])
-      else
-        server = Rack::Server.new(:Port => @port, :AccessLog => [])
-        # workaround for Rack bug, when Rack > 1.2.1 is released Rack::Server.start(:app => Jasmine.app(self)) will work
-        server.instance_variable_set(:@app, @application)
+      $stderr.puts "About to start Thin"
+
+      begin
+        server = ::Thin::Server.new('0.0.0.0', @port, @application)
         server.start
+      rescue Exception => e
+        $stderr.puts "failed to start Thin: " + e
       end
     end
   end

data/lib/jasmine/version.rb

@@ -1,3 +1,3 @@
 module Jasmine
-  VERSION = "1.2.0.12"
+  VERSION = "1.2.0.18"
 end

data/rally-jasmine.gemspec

@@ -66,8 +66,9 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'json_pure'
   s.add_development_dependency 'nokogiri'
 
-  s.add_dependency 'rally-jasmine-core', ">= 1.2.0.2"
+  s.add_dependency 'rally-jasmine-core', ">= 1.2.0.3"
   s.add_dependency 'rack', '~> 1.0'
   s.add_dependency 'rspec', '>= 1.3.1'
   s.add_dependency 'selenium-webdriver', '>= 0.1.3'
+  s.add_dependency 'thin', '>= 1.5.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rally-jasmine
 version: !ruby/object:Gem::Version
-  version: 1.2.0.12
+  version: 1.2.0.18
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-24 00:00:00.000000000 Z
+date: 2013-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -117,7 +117,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.0.2
+        version: 1.2.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -125,7 +125,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.0.2
+        version: 1.2.0.3
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -174,6 +174,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.1.3
+- !ruby/object:Gem::Dependency
+  name: thin
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.1
 description: Test your JavaScript without any framework dependencies, in any environment,
   and with a nice descriptive syntax.
 email: jasmine-js@googlegroups.com
@@ -283,7 +299,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3157245608277941443
+      hash: -3596832894580337131
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -292,10 +308,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3157245608277941443
+      hash: -3596832894580337131
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: JavaScript BDD framework with support for WebDriverJS