sproutcore 1.9.2 → 1.10.0.rc.1

data/lib/frameworks/sproutcore/apps/tests/controllers/targets.js

@@ -2,11 +2,11 @@
 // Project:   TestRunner.targetsController
 // Copyright: ©2011 Apple Inc.
 // ==========================================================================
-/*globals TestRunner */
+/*global TestRunner */
 
-/** @class
+/**
 
-  The full set of targets available in the application.  This is populated 
+  The full set of targets available in the application.  This is populated
   automatically when you call loadTargets().
 
   @extends SC.ArrayController
@@ -15,27 +15,22 @@ TestRunner.targetsController = SC.ArrayController.create(
 /** @scope TestRunner.targetsController.prototype */ {
 
   /**
-    Call this method whenever you want to reload the targets from the server.
-  */
-  reload: function() {
-    var targets = TestRunner.store.find(CoreTools.TARGETS_QUERY);
-    this.set('content', targets);
-  },
-  
-  /** 
     Generates the root array of children objects whenever the target content
     changes.  Used in a tree node.
   */
-  sourceRoot: function() {
-    
-    // break targets into their respective types.  Items that should not be 
+  sourceRoot: function () {
+
+    // break targets into their respective types.  Items that should not be
     // visible at the top level will not have a sort kind
     var kinds = {}, keys = [], kind, targets, ret;
-    
-    this.forEach(function(target) { 
-      if (kind = target.get('sortKind')) {
+
+    this.forEach(function (target) {
+      kind = target.get('sortKind');
+
+      if (kind) {
         targets = kinds[kind];
-        if (!targets) kinds[kind] = targets = [];
+        if (!targets) { kinds[kind] = targets = []; }
+
         targets.push(target);
         if (keys.indexOf(kind) < 0) keys.push(kind);
       }
@@ -44,43 +39,43 @@ TestRunner.targetsController = SC.ArrayController.create(
     // sort kinds alphabetically - with sproutcore at end and apps at top
     keys.sort();
     if (keys.indexOf('sproutcore') >= 0) {
-      keys.removeObject('sproutcore').pushObject('sproutcore');      
+      keys.removeObject('sproutcore').pushObject('sproutcore');
     }
     if (keys.indexOf('apps') >= 0) {
       keys.removeObject('apps').unshiftObject('apps');
     }
-    
+
     // once divided into kinds, create group nodes for each kind
     ret = [];
-    keys.forEach(function(kind) {
+    keys.forEach(function (kind) {
       targets = kinds[kind];
-      
+
       var defKey = "SourceList.%@.isExpanded".fmt(kind),
           expanded = TestRunner.userDefaults.get(defKey);
-      
+
       ret.push(SC.Object.create({
         displayName: "Kind.%@".fmt(kind).loc(),
         isExpanded: SC.none(expanded) ? (kind !== 'sproutcore') : expanded,
         children: targets.sortProperty('kind', 'displayName'),
-        
+
         isExpandedDefaultKey: defKey,
-        isExpandedDidChange: function() {
+        isExpandedDidChange: function () {
           TestRunner.userDefaults.set(this.get('isExpandedDefaultKey'), this.get('isExpanded'));
         }.observes('isExpanded')
       }));
     });
-    
+
     return SC.Object.create({ children: ret, isExpanded: YES });
-    
+
   }.property('[]').cacheable(),
-  
+
   /**
     Send event when targets load.
   */
-  statusDidChange: function() {
-    TestRunner.sendAction('targetsDidChange');
+  statusDidChange: function () {
+    if (this.get('status') === SC.Record.READY_CLEAN) {
+      TestRunner.statechart.resumeGotoState();
+    }
   }.observes('status')
 
-}) ;
-
-TestRunner.targetsController.addProbe('state');
+});

data/lib/frameworks/sproutcore/apps/tests/controllers/{detail.js → test.js}

@@ -1,25 +1,27 @@
 // ==========================================================================
-// Project:   TestRunner.detailController
+// Project:   TestRunner
 // Copyright: ©2011 Apple Inc.
 // ==========================================================================
-/*globals TestRunner */
+/*global TestRunner */
 
-/** @class
+/**
 
   The currently selected test in detail view.
 
   @extends SC.ObjectController
 */
-TestRunner.detailController = SC.ObjectController.create(
-/** @scope TestRunner.detailController.prototype */ {
-  
+TestRunner.testController = SC.ObjectController.create(
+/** @scope TestRunner.testController.prototype */ {
+
+  contentBinding: SC.Binding.oneWay('TestRunner.testsController.selection').single(),
+
   /**
-    Adds a random number onto the end of the URL to force the iframe to 
-    reload.
+    Adds a random number onto the end of the URL to force the iframe to reload.
   */
-  uncachedUrl: function() {
+  uncachedUrl: function () {
     var url = this.get('url');
-    return url ? [url, Date.now()].join('?') : url ;
+
+    return url ? [url, Date.now()].join('?') : url;
   }.property('url')
-  
-}) ;
+
+});

data/lib/frameworks/sproutcore/apps/tests/controllers/tests.js

@@ -2,9 +2,9 @@
 // Project:   TestRunner.testsController
 // Copyright: ©2011 Apple Inc.
 // ==========================================================================
-/*globals TestRunner */
+/*global TestRunner */
 
-/** @class
+/**
 
   Manages the list of tests for the currently focused target.
 
@@ -13,21 +13,17 @@
 TestRunner.testsController = SC.ArrayController.create(
 /** @scope TestRunner.testsController.prototype */ {
 
-  contentBinding: "TestRunner.targetController.tests",
-  
+  contentBinding: SC.Binding.oneWay('TestRunner.targetController.tests'),
+
   /**
     Enables/disables continuous integration mode.
   */
   useContinuousIntegration: NO,
-  
-  /**
-    Whenever we are actually showing the tests, then controls are enabled.
-    Set to YES when in READY_LIST mode.
-  */
-  isShowingTests: YES,
-  
-  statusDidChange: function() {
-    TestRunner.sendAction('testsDidChange');
+
+  statusDidChange: function () {
+    if (this.get('status') === SC.Record.READY_CLEAN) {
+      TestRunner.statechart.resumeGotoState();
+    }
   }.observes('status')
-  
-}) ;
+
+});

data/lib/frameworks/sproutcore/apps/tests/core.js

@@ -1,133 +1,28 @@
 // ==========================================================================
 // Project:   SproutCore - JavaScript Application Framework
-// Copyright: ©2006-2011 Strobe Inc. and contributors.
+// Copyright: ©2013 7x7 Software, Inc.
 //            Portions ©2008-2011 Apple Inc. All rights reserved.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
-/*globals CoreTools TestRunner */
+/*global TestRunner */
 
-/** @namespace
+/**
+  The TestRunner app.
 
-  My cool new app.  Describe your application.
-  
   @extends SC.Application
 */
 TestRunner = SC.Application.create(
   /** @scope TestRunner.prototype */ {
 
   NAMESPACE: 'TestRunner',
+
   VERSION: '0.1.0',
 
-  // This is your application store.  You will use this store to access all
-  // of your model data.  You can also set a data source on this store to
-  // connect to a backend server.  The default setup below connects the store
-  // to any fixtures you define.
   store: SC.Store.create().from('CoreTools.DataSource'),
-  
-  /** Returns all known targets */
-  targets: function() {
-    return this.get('store').find(CoreTools.TARGETS_QUERY);
-  }.property().cacheable(),
-  
-  trace: NO,
-  
+
   userDefaults: SC.UserDefaults.create({
     userDomain: 'anonymous',
     appDomain:  'SC.TestRunner'
-  }),
-  
-  // ..........................................................
-  // ROUTE SUPPORT
-  // 
-  
-  /**
-    The current route.  This is set whenever the route changes.
-  */
-  route: {},
-  
-  /**
-    Whenever the route changes and it does not match the current state,
-    this will be set to YES.  Whenever states transition, if the route is
-    pending, they will try to move it on to the next step if possible.
-  */
-  routePending: NO,
-  
-  /**
-    Computes the current target as named by the route.  If the target is not
-    found it will return null.  
-  */
-  computeRouteTarget: function() {
-    var name = this.get('route').target;
-    if (!name) return null;
-    else return TestRunner.targetsController.findProperty('name', name);    
-  },
-  
-  /**
-    Computes the current test as named by the route.  If the test is not found
-    it will return null.
-  */
-  computeRouteTest: function() {
-    var name = this.get('route').test;
-    if (!name) return null;
-    else return TestRunner.testsController.findProperty('filename', name);
-  },
-  
-  /**
-    Called whenever the route changes.  Sends an appropriate event down the
-    responder chain.  Also sets the current target.
-  */
-  routeDidChange: function(params) {
-    if (!params.target) return NO; // nothing to do
-    
-    // normalize target + test
-    params = SC.clone(params);
-    if (params.target) params.target = '/' + params.target;
-    if (params.test) params.test   = 'tests/' + params.test ;
-    
-    // save the desired state properties
-    this.set('route', params);
-    this.set('routePending', YES);
-    
-    this.trace = YES;
-    this.sendAction('route', this, params);
-    this.trace=NO;
-
-    return YES;
-  },
-  
-  /**
-    Called by the state machine whenever it lands in a stable target state.
-    Pass in the target and test.  We'll update the location and set a new 
-    target route state if needed.
-    
-    Whenever you update the route to the current route state, then 
-    routePending will be cleared.
-    
-    Passing isFinal will force the routePending to go to NO.  pass this when
-    the state is at a dead-end and can't move forward any further.
-  */
-  updateRoute: function(target, test, isFinal) {
-    var route = this.get('route'),
-        loc;
-    
-    if (isFinal || ((target === route.target) && (test === route.test))) {
-      this.set('routePending', NO);
-    }
-
-    // if a route is not pending, then update the current location with the
-    // new route
-    if (!this.get('routePending')) {
-      if (target) target = target.get('name');
-      if (test)   test = test.get('filename');
-
-      loc = target ? target.slice(1) : '';
-      if (test) loc = '%@&test=%@'.fmt(loc, test.slice(6));
-
-      SC.routes.setIfChanged('location', loc);
-    }    
-  }
-  
-}) ;
+  })
 
-// Add a route handler to select a target and, optionally, a test.
-SC.routes.add('*target', TestRunner, TestRunner.routeDidChange);
+});

data/lib/frameworks/sproutcore/apps/tests/english.lproj/main_page.css

@@ -1,23 +1,16 @@
 h1.app-title {
   font-weight: bold;
   font-size: 18px;
-  margin: 0;
-  padding: 0;
-  line-height: 36px;
-  vertical-align: middle;
+  line-height: 35px;
   padding-left: 12px;
-  letter-spacing: -1px;
-  color: white;
-  text-shadow: #3d4557 0px -1px 0px;
 }
- 
+
 h1.app-title img {
   width: 24px;
   height: 24px;
-  vertical-align: middle;
-  margin-right: 2px;
+  margin-right: 3px;
   position: relative;
-  top: -3px;
+  top: 4px;
 }
 
 .sc-collection-view.test-list .sc-collection-item {
@@ -32,17 +25,14 @@ h1.app-title img {
 
 .sc-label-view.center-label {
   color: white;
-  opacity: 0.8;
-	filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80);
-  -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=80)"; 
-  -moz-opacity:0.8;  
+  font-weight: bold;
+  text-align: center;
 }
 
-.sc-view.sc-toolbar-view.bottom-toolbar {
-    z-index:2;
-    -webkit-box-shadow: none;
+.sc-label-view.location-label {
+  text-align: right;
 }
 
 .sc-view.sc-toolbar-view .sc-checkbox-view {
   color: white;
-}
+}

data/lib/frameworks/sproutcore/apps/tests/english.lproj/main_page.js

@@ -4,177 +4,166 @@
 //            Portions ©2008-2011 Apple Inc. All rights reserved.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
-/*globals TestRunner */
+/*global TestRunner */
 
 sc_require('views/offset_checkbox');
 
-// This page describes the main user interface for your application.  
+// This page describes the main user interface for your application.
 TestRunner.mainPage = SC.Page.design({
 
   /**
     This is the main pane that is displayed when the application loads.  The
-    main views are configured here including the sidebar, toolbar at the 
+    main views are configured here including the sidebar, toolbar at the
     bottom and the iframe.
   */
   mainPane: SC.MainPane.design({
 
-    defaultResponder: "TestRunner",
-    
+    defaultResponder: TestRunner.statechart,
+
     // when defining a generic view, just name the properties holding your
     // child views here.  the w() helper is like calling split(' ')
-    childViews: 'splitView toolbarView'.w(),
-    
-    // This is the main split view on the top of the screen.  Note that 
+    childViews: ['splitView', 'toolbarView'],
+
+    // This is the main split view on the top of the screen.  Note that
     // since SC.SplitView defines a few special types of views you don't need
     // to define a childViews array.
     splitView: SC.SplitView.design({
-      
-      layout: { left: 0, top: 0, right: 0, bottom: 32 },
-      
+
+      layout: { bottom: 36 },
+
       topLeftView: SC.ScrollView.design(SC.SplitChild, {
 
         size: 200,
-        
+
         hasHorizontalScroller: NO, // disable horizontal scrolling
         contentView: SC.SourceListView.design({
-          contentBinding: "TestRunner.sourceController.arrangedObjects",
-          selectionBinding: "TestRunner.sourceController.selection",
-          contentValueKey: "displayName",
-          hasContentIcon: YES,
-          contentIconKey:  "targetIcon",
-          
-          action: 'selectTarget'
+          action: 'selectTarget',
+          actOnSelect: true,
+          contentBinding: SC.Binding.oneWay('TestRunner.sourceController.arrangedObjects'),
+          selectionBinding: 'TestRunner.targetsController.selection',
+          contentValueKey: 'displayName',
+          hasContentIcon: true,
+          contentIconKey:  'targetIcon'
         })
       }),
-      
-      bottomRightView: SC.SceneView.design(SC.SplitChild, {
+
+      bottomRightView: SC.ContainerView.design(SC.SplitChild, {
         autoResizeStyle: SC.RESIZE_AUTOMATIC,
-        scenes: "testsMaster testsDetail".w(),
-        nowShowingBinding: "TestRunner.currentScene"
+        nowShowingBinding: SC.Binding.oneWay("TestRunner.currentScene")
       })
     }),
-    
+
     // This is the toolbar view that appears at the bottom.  We include two
-    // child views that alight right and left so that we can add buttons to 
+    // child views that alight right and left so that we can add buttons to
     // them and let them layout themselves.
     toolbarView: SC.ToolbarView.design({
 
-      anchorLocation: SC.ANCHOR_BOTTOM,
+      layout: { bottom: 0, borderTop: 1, height: 36, zIndex: 2 },
 
-      childViews: 'logo continuousIntegrationCheckbox runTestsButton'.w(),
-      classNames: 'bottom-toolbar',
+      childViews: ['logo', 'runTestsButton'], // , 'continuousIntegrationCheckbox'
 
       logo: SC.View.design({
-        layout: { left: 0, top: 0, bottom: 0, width: 200 },
-        classNames: 'app-title',
+        layout: { width: 200 },
+        classNames: ['app-title'],
         tagName: 'h1',
-        render: function(context, firstTime) {
-          var img_url = sc_static('images/sproutcore-logo');
+        render: function (context) {
+          var img_url = sc_static('images/sproutcore-32.png');
           context.push('<img src="%@" />'.fmt(img_url));
           context.push('<span>', "_Test Runner".loc(), "</span>");
         }
       }),
 
+      // Disabled
       continuousIntegrationCheckbox: TestRunner.OffsetCheckboxView.design({
         title: "Continuous Integration",
-        offsetBinding: "TestRunner.sourceController.sidebarThickness",
+        offsetBinding: SC.Binding.oneWay("TestRunner.sourceController.sidebarThickness"),
         valueBinding: "TestRunner.testsController.useContinuousIntegration",
-        isEnabledBinding: "TestRunner.testsController.isShowingTests",
+        isEnabledBinding: SC.Binding.oneWay("TestRunner.testsController.length").bool(),
         layout: { height: 18, centerY: 1, width: 170, left: 206 }
       }),
-      
+
       runTestsButton: SC.ButtonView.design({
-        title: "Run Tests",
-        isEnabledBinding: "TestRunner.testsController.isShowingTests",
+        action: 'runTests',
+        title: "Reload",
+        // isEnabledBinding: SC.Binding.oneWay("TestRunner.testsController.length").bool(),
+        isVisibleBinding: SC.Binding.oneWay('TestRunner.testController.content').bool(),
         layout: { height: 24, centerY: 0, width: 90, right: 12 }
       })
-      
-      
+
     })
   }),
 
   targetsLoading: SC.View.design({
     childViews: "labelView".w(),
-    
+
     labelView: SC.LabelView.design({
-      layout: { centerX: 0, centerY: 0, height: 24, width: 200 },
-      textAlign: SC.ALIGN_CENTER,
-      controlSize: SC.HUGE_CONTROL_SIZE,
-      classNames: "center-label",
+      layout: { centerX: 0, centerY: 0, height: 24, width: 200, opacity: 0.8 },
       controlSize: SC.LARGE_CONTROL_SIZE,
-      fontWeight: SC.BOLD_WEIGHT,
+      classNames: ['center-label'],
       value: "_Loading Targets".loc()
     })
   }),
 
   noTargets: SC.View.design({
     childViews: "labelView".w(),
-    
+
     labelView: SC.LabelView.design({
-      layout: { centerX: 0, centerY: 0, height: 24, width: 200 },
-      textAlign: SC.ALIGN_CENTER,
-      classNames: "center-label",
+      layout: { centerX: 0, centerY: 0, height: 24, width: 200, opacity: 0.8 },
+      classNames: ['center-label'],
       controlSize: SC.LARGE_CONTROL_SIZE,
-      fontWeight: SC.BOLD_WEIGHT,
       value: "_No Targets".loc()
     })
   }),
 
   noTests: SC.View.design({
     childViews: "labelView".w(),
-    
+
     labelView: SC.LabelView.design({
-      layout: { centerX: 0, centerY: 0, height: 24, width: 200 },
-      textAlign: SC.ALIGN_CENTER,
-      classNames: "center-label",
+      layout: { centerX: 0, centerY: 0, height: 24, width: 200, opacity: 0.8 },
+      classNames: ['center-label'],
       controlSize: SC.LARGE_CONTROL_SIZE,
-      fontWeight: SC.BOLD_WEIGHT,
       value: "_No Tests".loc()
     })
   }),
-  
+
   testsLoading: SC.View.design({
     childViews: "labelView".w(),
-    
+
     labelView: SC.LabelView.design({
-      layout: { centerX: 0, centerY: 0, height: 24, width: 200 },
-      textAlign: SC.ALIGN_CENTER,
-      classNames: "center-label",
+      layout: { centerX: 0, centerY: 0, height: 24, width: 200, opacity: 0.8 },
+      classNames: ['center-label'],
       controlSize: SC.LARGE_CONTROL_SIZE,
-      fontWeight: SC.BOLD_WEIGHT,
       value: "_Loading Tests".loc()
     })
   }),
 
   testsNone: SC.View.design({
-    childViews: "labelView".w(),
-    
+    childViews: ['labelView'],
+
     labelView: SC.LabelView.design({
-      layout: { centerX: 0, centerY: 0, height: 24, width: 200 },
-      textAlign: SC.ALIGN_CENTER,
-      classNames: "center-label",
+      layout: { centerX: 0, centerY: 0, height: 24, width: 200, opacity: 0.8 },
+      classNames: ['center-label'],
       controlSize: SC.LARGE_CONTROL_SIZE,
-      fontWeight: SC.BOLD_WEIGHT,
       value: "_No Target Selected".loc()
     })
   }),
-  
-  /* list view:  displayed when you are in the READY_LIST state, this view 
+
+  /* list view:  displayed when you are in the READY_LIST state, this view
      shows all of the unit tests for the selected target.
   */
   testsMaster: SC.ScrollView.design({
-    
+
     // configure scroll view do hide horizontal scroller
     hasHorizontalScroller: NO,
-    
+
     // this is the list view that actually shows the content
     contentView: SC.ListView.design({
-      
+
       // bind to the testsController, which is an ArrayController managing the
       // tests for the currently selected target.
-      contentBinding: "TestRunner.testsController.arrangedObjects",
-      selectionBinding: "TestRunner.testsController.selection",
-      
+      contentBinding: SC.Binding.oneWay('TestRunner.testsController.arrangedObjects'),
+      selectionBinding: 'TestRunner.testsController.selection',
+
       // configure the display options for the item itself.  The row height is
       // larger to make this look more like a menu.  Also by default show
       // the title.
@@ -189,44 +178,44 @@ TestRunner.mainPage = SC.Page.design({
 
       contentValueKey: "displayName",
 
-      // the following two options will make the collection view act like a 
+      // the following two options will make the collection view act like a
       // menu.  It will send the action down the responder chain whenever you
       // click on an item.  When in the READY state, this action will show the
       // detail view.
       actOnSelect: YES,
       action: "selectTest"
-      
+
     })
   }),
-  
+
   testsDetail: SC.View.design({
-    childViews: "navigationView webView".w(),
+    childViews: ['navigationView', 'webView'],
 
     navigationView: SC.ToolbarView.design({
       classNames: 'navigation-bar',
-      
-      layout: { top: 0, left: 0, right: 0, height: 32 },
-      childViews: "backButton locationLabel".w(),
-      
+
+      layout: { borderBottom: 1, top: 0, left: 0, right: 0, height: 34, zIndex: 2 },
+      childViews: ['backButton', 'locationLabel'],
+
       backButton: SC.ButtonView.design({
         layout: { left: 8, centerY: 0, width: 80, height: 24 },
         title: "« Tests",
         action: "back"
       }),
-      
+
       locationLabel: SC.LabelView.design({
-        layout: { right: 8, centerY: -2, height: 16, left: 100 },
-        textAlign: SC.ALIGN_RIGHT,
-        valueBinding: "TestRunner.detailController.displayName"
+        classNames: ['location-label'],
+        layout: { right: 10, centerY: 0, height: 16, left: 100 },
+        valueBinding: SC.Binding.oneWay("TestRunner.testController.displayName")
       })
-      
+
     }),
-    
+
     webView: SC.WebView.design({
-      layout: { top: 33, left: 2, right: 0, bottom: 0 },
-      valueBinding: SC.Binding.oneWay("TestRunner.detailController.uncachedUrl")
+      layout: { top: 34, left: 2, right: 0, bottom: 0 },
+      valueBinding: SC.Binding.oneWay("TestRunner.testController.uncachedUrl")
     })
-  })  
+  })
 
 });