sproutcore 1.10.0.rc.1 → 1.10.0.rc.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmExM2Q0ODdjYmE2ZDE2MDJlMmVjN2NhM2M2YWVhOTU0NDcyZjA1YQ==
+    ZDg1MjQwYWRlZjUzZGFmNjFkMGUyYjFjYmFhN2NjNGM3MzM1M2IyZg==
   data.tar.gz: !binary |-
-    OTgwODlkZjc3NWZkNjhlZjk4ODJhZjY4YTk1OTdkZDBiNzQ5OTQxZg==
+    NWEzMzgxNjhlYTJjOTBlMDQxNTgzYTYxOTNmYzE4MTU4ZmViOGQ2MA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NWY3YjliYWNhNzBjZGU1YmYwM2JjMjRmNThiZDIxYzVlYjIxNTJmZjFkMTY0
-    ODM4YmZkYzM4M2JlMWRiYTgzM2JhMGZlZWQyNWZiN2Q5YWU1ODBlZjBkNjE0
-    MGQyYmEyYzc3NDI2NjE5ZjdhOWZlMDE3NTQwMWIyN2FjMGI1ZWY=
+    M2VkY2E5ZTBkNTY3MTdjZTk0YmY1YmU4YjAyYzFkYzc5Nzg1YzQxN2ViZmEz
+    MDlkMDBkOTZmMWY1YzNkMTgwNWNiNTcyNjcyOGJmMjY5YzViYTkyYmRiY2Uz
+    Mzk3OWI0ZjZhMTI4YjYyZTZhNzRmZDkxYjIwMjZkZGYwN2NmOTI=
   data.tar.gz: !binary |-
-    MzljZGUwZWIwOWNhZjYwNWEzYTE3OWJkYzdmY2RhZmJiNWNlN2NjZjc3NDc3
-    NjljMWZlYjI0MmJjYTRjMGU2OGYyMzI0M2UyNDQ3MjcwYTljOTkzMzA4NTEy
-    NjM4OWYyYzg2MDU2MDk5NzQyZWNmMDYyOGRmM2Y4OTliOTkxMGI=
+    OWVlMzRiOGMxNGRkMWVmYWRjMmU5MTRjYjFjYTExZTYyZjRmYmU5NDZmZDBj
+    ZjRiMTA4YmNlZWJjZjMwMzZlNjFjZDYwNjgzZmY2YWZjZTYzOGRiNzYyNjg1
+    NzFhNDQ1ZGY4NjU0N2I4MWE3OTJjMzRhMDNlNTM4ZTA1YzBlZTE=

data/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 1
 :minor: 10
-:patch: 0.rc.1
+:patch: 0.rc.2

data/bin/sc-build

@@ -1,16 +1,13 @@
 #!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'sc-build' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
+# ===========================================================================
+# Project:   Abbot - SproutCore Build Tools
+# Copyright: ©2010 Apple Inc.
+#            portions copyright @2006-2011 Strobe Inc.
+#            and contributors
+# ===========================================================================
 
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
+require "sproutcore"
 
-require 'rubygems'
-require 'bundler/setup'
+SC::Tools.invoke 'build'
 
-load Gem.bin_path('sproutcore', 'sc-build')
+# EOF

data/bin/sc-build-number

@@ -1,16 +1,13 @@
 #!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'sc-build-number' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
+# ===========================================================================
+# Project:   Abbot - SproutCore Build Tools
+# Copyright: ©2010 Apple Inc.
+#            portions copyright @2006-2011 Strobe Inc.
+#            and contributors
+# ===========================================================================
 
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
+require "sproutcore"
 
-require 'rubygems'
-require 'bundler/setup'
+SC::Tools.invoke :build_number
 
-load Gem.bin_path('sproutcore', 'sc-build-number')
+# EOF

data/bin/sc-docs

@@ -1,16 +1,19 @@
 #!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'sc-docs' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
+# -*- coding: utf-8 -*-
+# ===========================================================================
+# Project:   Abbot - SproutCore Build Tools
+# Copyright: ©2010 Apple Inc.
+#            portions copyright @2006-2011 Strobe Inc.
+#            and contributors
+# ===========================================================================
 
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
+require "sproutcore"
 
-require 'rubygems'
-require 'bundler/setup'
+begin
+  require 'sc_docs/cli'
+  ScDocs::CLI.start
+rescue LoadError
+  puts "sc-docs is no longer bundled with SproutCore. Please install the sc-docs tool instead."
+end
 
-load Gem.bin_path('sproutcore', 'sc-docs')
+# EOF

data/bin/sc-gen

@@ -1,16 +1,13 @@
 #!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'sc-gen' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
+# ===========================================================================
+# Project:   Abbot - SproutCore Build Tools
+# Copyright: ©2010 Apple Inc.
+#            portions copyright @2006-2011 Strobe Inc.
+#            and contributors
+# ===========================================================================
 
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
+require "sproutcore"
 
-require 'rubygems'
-require 'bundler/setup'
+SC::Tools.invoke 'gen'
 
-load Gem.bin_path('sproutcore', 'sc-gen')
+# EOF

data/bin/sc-init

@@ -1,16 +1,13 @@
 #!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'sc-init' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
+# ===========================================================================
+# Project:   Abbot - SproutCore Build Tools
+# Copyright: ©2010 Apple Inc.
+#            portions copyright @2006-2011 Strobe Inc.
+#            and contributors
+# ===========================================================================
 
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
+require "sproutcore"
 
-require 'rubygems'
-require 'bundler/setup'
+SC::Tools.invoke 'init'
 
-load Gem.bin_path('sproutcore', 'sc-init')
+# EOF

data/bin/sc-manifest

@@ -1,16 +1,13 @@
 #!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'sc-manifest' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
+# ===========================================================================
+# Project:   Abbot - SproutCore Build Tools
+# Copyright: ©2010 Apple Inc.
+#            portions copyright @2006-2011 Strobe Inc.
+#            and contributors
+# ===========================================================================
 
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
+require "sproutcore"
 
-require 'rubygems'
-require 'bundler/setup'
+SC::Tools.invoke :manifest
 
-load Gem.bin_path('sproutcore', 'sc-manifest')
+# EOF

data/bin/sc-server

@@ -1,16 +1,13 @@
 #!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'sc-server' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
+# ===========================================================================
+# Project:   Abbot - SproutCore Build Tools
+# Copyright: ©2010 Apple Inc.
+#            portions copyright @2006-2011 Strobe Inc.
+#            and contributors
+# ===========================================================================
 
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
+require "sproutcore"
 
-require 'rubygems'
-require 'bundler/setup'
+SC::Tools.invoke 'server'
 
-load Gem.bin_path('sproutcore', 'sc-server')
+# EOF

data/bin/sproutcore

@@ -1,16 +1,13 @@
 #!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'sproutcore' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
+# ===========================================================================
+# Project:   Abbot - SproutCore Build Tools
+# Copyright: ©2010 Apple Inc.
+#            portions copyright @2006-2011 Strobe Inc.
+#            and contributors
+# ===========================================================================
 
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
+require "sproutcore"
 
-require 'rubygems'
-require 'bundler/setup'
+SC::Tools.start
 
-load Gem.bin_path('sproutcore', 'sproutcore')
+# EOF

data/lib/frameworks/sproutcore/frameworks/ajax/tests/system/request.js

@@ -9,7 +9,10 @@
 // ========================================================================
 /*globals module, test, ok, isObj, equals, expects */
 
-var url, request, contents;
+var url, request, contents, test_timeout=2500;
+if(window._phantom) {
+    test_timeout=5000;
+}
 
 module("SC.Request", {
 
@@ -135,11 +138,11 @@ test("Test Asynchronous GET Request", function() {
     window.start();
   });
 
+  stop(test_timeout); // stops the test runner - wait for response
+
   response = request.send();
   ok(response !== null, 'request.send() should return a response object');
   ok(response.get('status')<0, 'response should still not have a return code since this should be async');
-
-  stop(2500); // stops the test runner - wait for response
 });
 
 test("Test Synchronous GET Request", function() {
@@ -169,10 +172,9 @@ test("Test Asynchronous GET Request, auto-deserializing JSON", function() {
     window.start();
   });
 
-  request.send();
-
-  stop(2500); // stops the test runner
+  stop(test_timeout); // stops the test runner
 
+  request.send();
 });
 
 test("Test auto-deserializing malformed JSON", function() {
@@ -197,9 +199,9 @@ test("Test auto-deserializing malformed JSON", function() {
     window.start();
   });
 
-  request.send();
+  stop(test_timeout);
 
-  stop(2500);
+  request.send();
 });
 
 test("Test Synchronous GET Request, auto-deserializing JSON", function() {
@@ -243,7 +245,7 @@ test("Test Multiple Asynchronous GET Request - two immediate, and two in serial"
   SC.Request.getUrl(url).notify(this, observer).send();
   SC.Request.getUrl(url).notify(this, observer).send();
 
-  stop(2500); // stops the test runner
+  stop(test_timeout); // stops the test runner
   setTimeout( function(){
     equals(requestCount, 6, "requestCount should be 6");
     equals(responseCount, 6, "responseCount should be 6");
@@ -312,13 +314,13 @@ test("Timeouts - SC.Request didReceive callback", function() {
     }
   });
 
+  // Stop the test runner and wait for a timeout or a response.
+  stop(test_timeout);
+
   SC.RunLoop.begin();
   timeoutRequest.send();
   SC.RunLoop.end();
 
-  // Stop the test runner and wait for a timeout or a response.
-  stop(2500);
-
   // In case we never receive a timeout, just start unit testing again after
   // 500ms.
   checkstop = setTimeout(function() {
@@ -328,6 +330,9 @@ test("Timeouts - SC.Request didReceive callback", function() {
 });
 
 test("Timeouts - Status listener callback", function() {
+  // sanity check
+  equals(SC.Request.manager.inflight.length,0,"there should be no inflight requests");
+
   // Make sure timeouts actually fire, and fire when expected.
   // Point to local server so test works offline
   var timeoutRequest = SC.Request.getUrl("/"),
@@ -345,12 +350,12 @@ test("Timeouts - Status listener callback", function() {
     return YES;
   });
 
+  stop(test_timeout); // stops the test runner
+
   SC.RunLoop.begin();
   timeoutRequest.send();
   SC.RunLoop.end();
 
-  stop(2500); // stops the test runner
-
   // in case nothing works
   checkstop = setTimeout(function() {
     ok(false, 'timeout did not fire at all');
@@ -362,27 +367,34 @@ test("Test Multiple listeners per single status response", function() {
   var numResponses = 0;
   var response;
 
-  expect(4);
+  expect(8);
+  
+  // sanity check
+  equals(SC.Request.manager.inflight.length,0,"there should be no inflight requests");
 
   request.notify(200, this, function(response) {
     numResponses++;
-    ok(true, "Received a response");
-
-    if (numResponses === 2) { window.start(); }
+    ok(true, "Received a response on first listener");
   });
 
   request.notify(200, this, function(response) {
     numResponses++;
-    ok(true, "Received a response");
-
-    if (numResponses === 2) { window.start(); }
+    ok(true, "Received a response on second listener");
   });
+  
+  setTimeout(function() {
+    equals(SC.Request.manager.inflight.length,0,"there should be no inflight requests after the timeout");
+    equals(numResponses, 2, "got two notifications");
+    if (numResponses === 2) { window.start(); }
+  }, ((test_timeout*5) - 500) );
+
+  // phantomjs (used in integration tests) needs a veeeery long timeout, just for this test
+  stop(test_timeout*5); // stops the test runner - wait for response
 
   response = request.send();
   ok(response !== null, 'request.send() should return a response object');
   ok(response.get('status')<0, 'response should still not have a return code since this should be async');
-
-  stop(2500); // stops the test runner - wait for response
+  equals(SC.Request.manager.inflight.length,1,"there should be 1 inflight request after send()");
 });
 
 
@@ -393,6 +405,9 @@ test("Test Multiple listeners per single status response", function() {
 */
 test("Multiple arguments passed to notify()", function() {
   var response;
+  
+  // sanity check
+  equals(SC.Request.manager.inflight.length,0,"there should be no inflight requests");
 
   request.notify(this, function(response, a, b, c) {
     equals(a, 'a', "Listener called with argument 'a'");
@@ -408,9 +423,9 @@ test("Multiple arguments passed to notify()", function() {
     window.start();
   }, 'a', 'b', 'c');
 
-  response = request.send();
+  stop(test_timeout); // stops the test runner - wait for response
 
-  stop(2500); // stops the test runner - wait for response
+  response = request.send();
 });
 
 
@@ -458,9 +473,9 @@ test("Test event listeners on successful request.", function() {
     window.start();
   });
 
-  response = request.send();
+  stop(test_timeout); // stops the test runner - wait for response
 
-  stop(2500); // stops the test runner - wait for response
+  response = request.send();
 });
 
 if (window.XMLHttpRequestProgressEvent) {
@@ -505,9 +520,9 @@ if (window.XMLHttpRequestProgressEvent) {
       window.start();
     });
 
-    response = request.send();
+    stop(test_timeout); // stops the test runner - wait for response
 
-    stop(2500); // stops the test runner - wait for response
+    response = request.send();
   });
 }
 
@@ -565,9 +580,9 @@ test("Test upload event listeners on successful request.", function() {
     body['k' + i] = 'v' + i;
   }
 
-  response = request.send(JSON.stringify(body));
+  stop(test_timeout); // stops the test runner - wait for response
 
-  stop(2500); // stops the test runner - wait for response
+  response = request.send(JSON.stringify(body));
 });
 
 

data/lib/frameworks/sproutcore/frameworks/core_foundation/system/render_context.js

@@ -1205,7 +1205,12 @@ SC.RenderContext = SC.Builder.create(
 });
 
 (function () {
-  var _escapeHTMLRegex = /[&<>]/g, _escapeHTMLMethod = function (match) {
+  // this regex matches all <, > or &, unless & is immediately followed by at last 1 up to 7 alphanumeric
+  // characters and a ;. For instance:
+  // Some evil <script src="evil.js"> but this is legal &amp; these are not & &illegalese;
+  // would become:
+  // Some evil &lt;script src="evil.js"&gt; but this is legal &amp; these are not &amp; &amp;illegalese;
+  var _escapeHTMLRegex = /[<>]|&(?![\d\w#]{1,7};)/g, _escapeHTMLMethod = function (match) {
     switch (match) {
     case '&':
       return '&amp;';
@@ -1218,7 +1223,8 @@ SC.RenderContext = SC.Builder.create(
 
   /**
     Helper method escapes the passed string to ensure HTML is displayed as
-    plain text.  You should make sure you pass all user-entered data through
+    plain text while preserving HTML entities like &apos; , &agrave;, etc.
+    You should make sure you pass all user-entered data through
     this method to avoid errors.  You can also do this with the text() helper
     method on a render context.
 

data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/render_context/escape_html.js

@@ -13,6 +13,14 @@ test("Escaping HTML", function() {
   equals(output, '<p>HTML!</p><script>alert(\'hi\');</script> & Hello, World!', "Properly escapes HTML");
 });
 
+module("Render Context--Escaping , preserve HTML entities like '");
+test("Escaping HTML, preserve HTML entities", function() {
+  var input = "<p>HTML!</p><script>alert('hi');<" + "/script> &illegalese; & &amp; Hello, World!";
+  var output = SC.RenderContext.escapeHTML(input);
+  
+  equals(output, '&lt;p&gt;HTML!&lt;/p&gt;&lt;script&gt;alert(\'hi\');&lt;/script&gt; &amp;illegalese; &amp; &amp; Hello, World!', "Properly escapes HTML");
+});
+
 test("Tests stolen from Prototype.js", function() {
   var largeTextEscaped = '&lt;span&gt;test&lt;/span&gt;', 
       largeTextUnescaped = '<span>test</span>';

data/lib/frameworks/sproutcore/frameworks/core_foundation/views/view/animation.js

@@ -285,10 +285,6 @@ SC.View.reopen(
 
     // In the case of zero duration, just adjust and call the callback.
     if (options.duration === 0) {
-      //@if(debug)
-      // Provide a little developer support if they are doing something that should be considered wrong.
-      SC.warn("Developer Warning: SC.View:animate() was called with a duration of 0 seconds.  The view will be adjusted and the callback will fire immediately in the next run loop.");
-      //@endif
       this.adjust(hash);
       this.runAnimationCallback(options, null, NO);
       return this;

data/lib/frameworks/sproutcore/frameworks/designer/views/page_item_view.js

@@ -3,17 +3,17 @@
 // ==========================================================================
 /*globals SC */
 
-/** @class
+/**
   This View is used by Greenhouse when application is in design mode
   Used for displaying page items
 
   @extends SC.ListItemVIew
   @author Mike Ball
-  
+
 */
 
 SC.pageItemView = SC.ListItemView.extend(
-/** @scope SC.ListItemView.prototype */ { 
+/** @scope SC.ListItemView.prototype */ {
   isDropTarget: YES,
 
   dragEntered: function(drag, evt) {
@@ -22,42 +22,42 @@ SC.pageItemView = SC.ListItemView.extend(
 
   dragExited: function(drag, evt) {
     this.$().removeClass('highlight');
- 
+
   },
 
   dragEnded: function(drag, evt) {
     this.$().removeClass('highlight');
- 
+
   },
 
   /**
    Called when the drag needs to determine which drag operations are
    valid in a given area.
 
-   Override this method to return an OR'd mask of the allowed drag 
-   operations.  If the user drags over a droppable area within another 
-   droppable area, the drag will latch onto the deepest view that returns one 
+   Override this method to return an OR'd mask of the allowed drag
+   operations.  If the user drags over a droppable area within another
+   droppable area, the drag will latch onto the deepest view that returns one
    or more available operations.
 
    The default implementation returns `SC.DRAG_NONE`
 
    @param {SC.Drag} drag The current drag object
-   @param {SC.Event} evt The most recent mouse move event.  Use to get 
-     location 
-   @returns {DragOps} A mask of all the drag operations allowed or 
+   @param {SC.Event} evt The most recent mouse move event.  Use to get
+     location
+   @returns {DragOps} A mask of all the drag operations allowed or
      SC.DRAG_NONE
   */
-  computeDragOperations: function(drag, evt) { 
+  computeDragOperations: function(drag, evt) {
     if(drag.hasDataType('SC.Binding')){
       return SC.DRAG_LINK;
     }
-    return SC.DRAG_NONE; 
+    return SC.DRAG_NONE;
   },
 
   /**
    Called when the user releases the mouse.
 
-   This method gives your drop target one last opportunity to choose to 
+   This method gives your drop target one last opportunity to choose to
    accept the proposed drop operation.  You might use this method to
    perform fine-grained checks on the drop location, for example.
    Return true to accept the drop operation.
@@ -68,7 +68,7 @@ SC.pageItemView = SC.ListItemView.extend(
    @param {DragOp} op The proposed drag operation. A drag constant
 
    @return {Boolean} YES if operation is OK, NO to cancel.
-  */  
+  */
   acceptDragOperation: function(drag, op) { return YES; },
 
   /**
@@ -87,11 +87,11 @@ SC.pageItemView = SC.ListItemView.extend(
 
    @return {DragOp} Drag Operation actually performed
   */
-  performDragOperation: function(drag, op) { 
+  performDragOperation: function(drag, op) {
     var data = drag.dataForType('SC.Binding'), that = this;
     if(data && SC._Greenhouse){
       var actionObj = SC.Object.create({
-        type: 'Binding', 
+        type: 'Binding',
         source: data,
         target: that.get('content'),
         addItem: function(from, to, designAttrs){
@@ -99,7 +99,7 @@ SC.pageItemView = SC.ListItemView.extend(
           var value = that._propertyPathForProp(this.getPath('target.view.page'),this.getPath('target.view'));
           view[from+"Binding"] = designAttrs[from+"Binding"] = value+"."+to;
           view.propertyDidChange(from+"Binding");
-          
+
           var designer = view.get('designer');
           if(designer){
             designer.designProperties.pushObject(from+"Binding");
@@ -114,10 +114,10 @@ SC.pageItemView = SC.ListItemView.extend(
       return SC.DRAG_LINK;
     }
     else{
-      return SC.DRAG_NONE; 
+      return SC.DRAG_NONE;
     }
   },
-  
+
   _propertyPathForProp: function(page, prop){
     for(var key in page){
       if(page.hasOwnProperty(key)){
@@ -125,6 +125,6 @@ SC.pageItemView = SC.ListItemView.extend(
       }
     }
   }
-   
+
 });
 

data/lib/frameworks/sproutcore/frameworks/desktop/render_delegates/radio.js

@@ -39,7 +39,8 @@ SC.BaseTheme.radioRenderDelegate = SC.RenderDelegate.create({
     context.setClass({
       active: dataSource.get('isActive'),
       mixed: dataSource.get('isMixed'),
-      sel: dataSource.get('isSelected')
+      sel: dataSource.get('isSelected'),
+      disabled: !dataSource.get('isEnabled')
     });
 
     //accessing accessibility
@@ -69,7 +70,8 @@ SC.BaseTheme.radioRenderDelegate = SC.RenderDelegate.create({
     jquery.setClass({
       active: dataSource.get('isActive'),
       mixed: dataSource.get('isMixed'),
-      sel: dataSource.get('isSelected')
+      sel: dataSource.get('isSelected'),
+      disabled: !dataSource.get('isEnabled')
     });
 
     jquery.attr('aria-disabled', dataSource.get('isEnabled') ? 'false' : 'true');

data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/segmented/ui.js

@@ -385,7 +385,7 @@ var pane;
       var overflowEl = segments[segments.length - 1];
       ok($(overflowEl).hasClass('sc-overflow-segment'), 'overflow segment should have .sc-overflow-segment class');
       var overflowLabelEl = $(overflowEl).find('label')[0];
-      equals(overflowLabelEl.innerText, "»", 'there should be "»" text in the overflow segment');
+      equals(overflowLabelEl.innerHTML, "»", 'there should be "»" text in the overflow segment');
     };
 
     var lastIsSegment = function (sv, text) {
@@ -393,7 +393,7 @@ var pane;
       var lastEl = segments[segments.length - 2];
       ok(!$(lastEl).hasClass('sc-overflow-segment'), 'last segment should not have .sc-overflow-segment class');
       var lastLabelEl = $(lastEl).find('label')[0];
-      equals(lastLabelEl.innerText, text, 'there should be "' + text + '" text in the last segment');
+      equals(lastLabelEl.innerHTML, text, 'there should be "' + text + '" text in the last segment');
     };
 
     // the last item should be an overflow segment (ie. has .sc-overflow-segment class and text "&raquo")

data/lib/frameworks/sproutcore/tests/phantomjs_runner.phantomjs

@@ -22,6 +22,7 @@ function waitFor(testFx, onReady, timeOutMillis) {
 
 var env = require('system').env;
 var args = require('system').args;
+var fs = require('fs');
 
 var travis=env['TRAVIS_JOB_ID']?env['TRAVIS_JOB_ID']:false,
     verbose=env['VERBOSE']?env['VERBOSE']:false,
@@ -29,16 +30,6 @@ var travis=env['TRAVIS_JOB_ID']?env['TRAVIS_JOB_ID']:false,
     host=env['IP']?env['IP']:"127.0.0.1",
     filter=(args.length === 2 ? new RegExp(args[1]) : false);
 
-if(!travis && verbose) {
-  page.onError = function(err, stack) {
-    console.log("CONSOLE ERROR: "+err);
-  };
-
-  page.onConsoleMessage = function(msg, lineNum, sourceId) {
-    console.log('CONSOLE: ' + msg);
-  };
-}
-
 var urls=[
     {url:'sproutcore/core_foundation/en/current/tests/views/pane/layout.html'},
     {url:'sproutcore/core_foundation/en/current/tests/views/pane/sendEvent.html'},
@@ -512,6 +503,19 @@ var outcome=0;
 var failed=0;
 var webpage = require('webpage');
 
+function configure(page) {
+    if(!travis && verbose) {
+      page.onError = function(err, stack) {
+        console.log("CONSOLE ERROR: "+err);
+      };
+    
+      page.onConsoleMessage = function(msg, lineNum, sourceId) {
+        console.log('CONSOLE: ' + msg);
+      };
+    }
+    return page;
+}
+
 function logResult(r,i) {
     // output coloring
     var red, blue, reset;
@@ -533,7 +537,7 @@ function runTest(idx, cb) {
     if (!filter || url.match(filter)) {
         run++;
         var page = webpage.create();
-        page.viewportSize = { width: 1024, height: 768 };
+        configure(page).viewportSize = { width: 1024, height: 768 };
         // Chrome/Linux
         //page.settings.userAgent = "Mozilla/5.0 (X11; Linux i686) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/28.0.1500.71 Safari/537.36";
         page.open('http://'+host+':'+port+'/'+url, function (status) {
@@ -572,8 +576,10 @@ function runTest(idx, cb) {
                         urls[idx].resultText=resultText;
                         if(resultText.indexOf("failed")!=-1) {
                           urls[idx].status=TEST_FAILED; outcome=1; failed++;
+                          fs.write((idx+1)+'.html', page.content, 'w');
                         } else if(resultText.indexOf("error")!=-1) {
                           urls[idx].status=TEST_ERROR; outcome=1; failed++;
+                          fs.write((idx+1)+'.html', page.content, 'w');
                         } else {
                           urls[idx].status=TEST_PASSED;
                         }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sproutcore
 version: !ruby/object:Gem::Version
-  version: 1.10.0.rc.1
+  version: 1.10.0.rc.2
 platform: ruby
 authors:
 - Strobe, Inc., Apple Inc. and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-01 00:00:00.000000000 Z
+date: 2013-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack