sproutcore 1.0.1003 → 1.0.1008

data/frameworks/sproutcore/frameworks/desktop/tests/views/collection/mouse.js

@@ -51,11 +51,12 @@ module("SC.CollectionView Mouse Events", {
   @param {Number} index the index to click on
   @param {Boolean} shiftKey simulate shift key pressed 
   @param {Boolean} ctrlKey simulate ctrlKey pressed
-  @param {IndexSet} expected expected selection
+  @param {SC.SelectionSet} expected expected selection
+  @param {Number} delay delay before running the test (optional)
   @returns {void}
 */
 function clickOn(view, index, shiftKey, ctrlKey, expected, delay) {
-  var itemView = view.getPath('childViews.%@'.fmt(index)),
+  var itemView = view.itemViewForContentIndex(index),
       layer    = itemView.get('layer'), 
       opts     = { shiftKey: shiftKey, ctrlKey: ctrlKey }, 
       sel, ev, modifiers;
@@ -78,8 +79,6 @@ function clickOn(view, index, shiftKey, ctrlKey, expected, delay) {
       if (ctrlKey) modifiers.push('ctrl');
       modifiers = modifiers.length > 0 ? modifiers.join('+') : 'no modifiers';
       
-      expected = SC.SelectionSet.create().add(view.get('content'), expected);
-      
       ok(expected.isEqual(sel), 'should have selection: %@ after click with %@ on item[%@], actual: %@'.fmt(expected, modifiers, index, sel));
       SC.RunLoop.end();
       if (delay) window.start() ; // starts the test runner
@@ -94,24 +93,50 @@ function clickOn(view, index, shiftKey, ctrlKey, expected, delay) {
   layer = itemView = null ;
 }
 
+/*
+  Creates an SC.SelectionSet from a given index.
+
+  @param {Number} index the index of the content to select
+  @returns {SC.SelectionSet}
+*/
+
+function selectionFromIndex(index) {
+  var ret = SC.SelectionSet.create();
+  ret.addObject(content.objectAt(index));
+
+  return ret;
+}
+
+/*
+  Creates an SC.SelectionSet from a given SC.IndexSet.
+
+  @param {Number} index the index of the content to select
+  @returns {SC.SelectionSet}
+*/
+function selectionFromIndexSet(indexSet) {
+  var ret = SC.SelectionSet.create();
+  ret.add(content, indexSet);
+
+  return ret;
+}
+
 // ..........................................................
 // basic click
 // 
 
 test("clicking on an item should select it", function() {
-  clickOn(view, 3, NO, NO, SC.IndexSet.create(3));
+  clickOn(view, 3, NO, NO, selectionFromIndex(3));
 });
 
 test("clicking on a selected item should clear selection after 301ms and reselect it", function() {
   view.select(SC.IndexSet.create(1,5));
   SC.RootResponder.responder._lastMouseUpAt = null ; // HACK: don't want a doubleClick from previous tests
-  clickOn(view, 3, NO, NO, SC.IndexSet.create(3), 301);
+  clickOn(view, 3, NO, NO, selectionFromIndex(3), 301);
 });
 
 test("clicking on unselected item should clear selection and select it", function() {
-
   view.select(SC.IndexSet.create(1,5));
-  clickOn(view, 7, NO, NO, SC.IndexSet.create(7));
+  clickOn(view, 7, NO, NO, selectionFromIndex(7));
 });
 
 test("first responder", function() {
@@ -124,15 +149,15 @@ test("first responder", function() {
 // 
 
 test("ctrl-clicking on unselected item should add to selection", function() {
-  clickOn(view,3, NO, YES, SC.IndexSet.create(3));
-  clickOn(view,5, NO, YES, SC.IndexSet.create(3).add(5));
+  clickOn(view,3, NO, YES, selectionFromIndex(3));
+  clickOn(view,5, NO, YES, selectionFromIndex(3).addObject(content.objectAt(5)));
 });
 
 test("ctrl-clicking on selected item should remove from selection", function() {
-  clickOn(view,3, NO, YES, SC.IndexSet.create(3));
-  clickOn(view,5, NO, YES, SC.IndexSet.create(3).add(5));
-  clickOn(view,3, NO, YES, SC.IndexSet.create(5));
-  clickOn(view,5, NO, YES, SC.IndexSet.create());
+  clickOn(view,3, NO, YES, selectionFromIndex(3));
+  clickOn(view,5, NO, YES, selectionFromIndex(3).addObject(content.objectAt(5)));
+  clickOn(view,3, NO, YES, selectionFromIndex(5));
+  clickOn(view,5, NO, YES, SC.SelectionSet.create());
 });
 
 // ..........................................................
@@ -140,35 +165,35 @@ test("ctrl-clicking on selected item should remove from selection", function() {
 // 
 
 test("shift-clicking on an item below should extend the selection", function() {
-  clickOn(view, 3, NO, NO, SC.IndexSet.create(3));
-  clickOn(view, 5, YES, NO, SC.IndexSet.create(3,3));
+  clickOn(view, 3, NO, NO, selectionFromIndex(3));
+  clickOn(view, 5, YES, NO, selectionFromIndexSet(SC.IndexSet.create(3,3)));
 });
 
 
 test("shift-clicking on an item above should extend the selection", function() {
-  clickOn(view, 3, NO, NO, SC.IndexSet.create(3));
-  clickOn(view, 1, YES, NO, SC.IndexSet.create(1,3));
+  clickOn(view, 3, NO, NO, selectionFromIndex(3));
+  clickOn(view, 1, YES, NO, selectionFromIndexSet(SC.IndexSet.create(1,3)));
 });
 
 test("shift-clicking inside selection first time should reduce selection from top", function() {
   view.select(SC.IndexSet.create(3,4));
-  clickOn(view,4, YES, NO, SC.IndexSet.create(3,2));
+  clickOn(view,4, YES, NO, selectionFromIndexSet(SC.IndexSet.create(3,2)));
 });
 
 test("shift-click below to extend selection down then shift-click inside selection should reduce selection", function() {
-  clickOn(view, 3, NO, NO, SC.IndexSet.create(3));
-  clickOn(view, 5, YES, NO, SC.IndexSet.create(3,3));
-  clickOn(view,4, YES, NO, SC.IndexSet.create(3,2));
+  clickOn(view, 3, NO, NO, selectionFromIndex(3));
+  clickOn(view, 5, YES, NO, selectionFromIndexSet(SC.IndexSet.create(3,3)));
+  clickOn(view,4, YES, NO, selectionFromIndexSet(SC.IndexSet.create(3,2)));
 });
 
 test("shift-click above to extend selection down then shift-click inside selection should reduce top of selection", function() {
-  clickOn(view, 3, NO, NO, SC.IndexSet.create(3));
-  clickOn(view, 1, YES, NO, SC.IndexSet.create(1,3));
-  clickOn(view,2, YES, NO, SC.IndexSet.create(2,2));
+  clickOn(view, 3, NO, NO, selectionFromIndex(3));
+  clickOn(view, 1, YES, NO, selectionFromIndexSet(SC.IndexSet.create(1,3)));
+  clickOn(view,2, YES, NO, selectionFromIndexSet(SC.IndexSet.create(2,2)));
 });
 
 test("shift-click below bottom of selection then shift click on top of selection should select only top item", function() {
-  clickOn(view, 3, NO, NO, SC.IndexSet.create(3));
-  clickOn(view, 5, YES, NO, SC.IndexSet.create(3,3));
-  clickOn(view,3, YES, NO, SC.IndexSet.create(3));
+  clickOn(view, 3, NO, NO, selectionFromIndex(3));
+  clickOn(view, 5, YES, NO, selectionFromIndexSet(SC.IndexSet.create(3,3)));
+  clickOn(view,3, YES, NO, selectionFromIndex(3));
 });

data/frameworks/sproutcore/frameworks/desktop/tests/views/collection/select.js

@@ -30,16 +30,16 @@ test("calling select(indexes=Number)", function() {
   
   view.select(3);
   
-  var expected = SC.SelectionSet.create().add(content, 3),
+  var expected = SC.SelectionSet.create().addObject(content.objectAt(3)),
       actual   = view.get('selection');
-  ok(expected.isEqual(actual), 'selection should have index only (expected: %@ actual: %@)'.fmt(expected, actual));
+  ok(expected.isEqual(actual), 'selection should have object (expected: %@ actual: %@)'.fmt(expected, actual));
 });
 
 test("calling select(indexes=Number, extend=YES)", function() {
 
   var base = SC.SelectionSet.create().add(content, 3,3),
       next = 1,
-      expected = base.copy().add(content, next),
+      expected = base.copy().addObject(content.objectAt(next)),
       actual;
   
   view.select(SC.IndexSet.create(3,3));
@@ -175,7 +175,7 @@ test("del.collectionViewShouldSelectIndexes - returns empty index set", function
 
   view.select(2);
   view.select(3); // should be ignored
-  var expected = SC.SelectionSet.create().add(content,2),
+  var expected = SC.SelectionSet.create().addObject(content.objectAt(2)),
       actual   = view.get('selection');
   ok(expected.isEqual(actual), 'selection should not change if delegate does not allow any proposed selected indexes (expected: %@ actual: %@)'.fmt(expected, actual));
 
@@ -191,7 +191,7 @@ test("del.collectionViewShouldSelectIndexes - delegate returns null", function()
   };
 
   view.select(10); // should be ignored
-  var expected = SC.SelectionSet.create().add(content,2),
+  var expected = SC.SelectionSet.create().addObject(content.objectAt(2)),
       actual   = view.get('selection');
   ok(expected.isEqual(actual), 'selection should not change if delegate returns null (expected: %@ actual: %@)'.fmt(expected, actual));
   
@@ -202,7 +202,7 @@ test("del.collectionViewSelectionForProposedSelection - returns indexes", functi
 
   del.collectionViewSelectionForProposedSelection = function(v, indexes) { 
 
-    var expected = SC.SelectionSet.create().add(content,10),
+    var expected = SC.SelectionSet.create().addObject(content.objectAt(10)),
         actual   = indexes;
     ok(expected.isEqual(actual), 'should pass proposed selection to delegate (expected: %@ actual: %@)'.fmt(expected, actual));
 

data/frameworks/sproutcore/frameworks/desktop/tests/views/collection/selectNextItem.js

@@ -18,13 +18,27 @@ module("SC.CollectionView.selectNextItem", {
   }
 });
 
+/*
+  Creates an SC.SelectionSet from a given index.
+
+  @param {Number} index the index of the content to select
+  @returns {SC.SelectionSet}
+*/
+
+function selectionFromIndex(index) {
+  var ret = SC.SelectionSet.create();
+  ret.addObject(content.objectAt(index));
+
+  return ret;
+}
+
 // ..........................................................
 // BASIC OPERATIONS
 //
 
 test("selectNextItem(extend=undefined, numberOfItems=undefined)", function() {
-  var sel = SC.SelectionSet.create().add(content,4),
-      expected = SC.SelectionSet.create().add(content,5),
+  var sel = selectionFromIndex(4),
+      expected = selectionFromIndex(5),
       actual;
       
   view.set('selection', sel);
@@ -35,8 +49,8 @@ test("selectNextItem(extend=undefined, numberOfItems=undefined)", function() {
 });
 
 test("selectNextItem(extend=NO, numberOfItems=undefined)", function() {
-  var sel = SC.SelectionSet.create().add(content,4),
-      expected = SC.SelectionSet.create().add(content,5),
+  var sel = selectionFromIndex(4),
+      expected = selectionFromIndex(5),
       actual;
       
   view.set('selection', sel);
@@ -47,7 +61,7 @@ test("selectNextItem(extend=NO, numberOfItems=undefined)", function() {
 });
 
 test("selectNextItem(extend=YES, numberOfItems=undefined)", function() {
-  var sel = SC.SelectionSet.create().add(content,4),
+  var sel = selectionFromIndex(4),
       expected = SC.SelectionSet.create().add(content,4,2),
       actual;
       
@@ -59,7 +73,7 @@ test("selectNextItem(extend=YES, numberOfItems=undefined)", function() {
 });
 
 test("selectNextItem(extend=YES, numberOfItems=2)", function() {
-  var sel = SC.SelectionSet.create().add(content,4),
+  var sel = selectionFromIndex(4),
       expected = SC.SelectionSet.create().add(content,4,3),
       actual;
       
@@ -132,7 +146,7 @@ test("anchor test 2 - anchor at end", function() {
 
   // TRY 3: should make selection one item long
   view.selectNextItem(YES); 
-  expected = SC.SelectionSet.create().add(content,7,1); 
+  expected = selectionFromIndex(7); 
   actual = view.get('selection');
   ok(expected.isEqual(actual), 'TRY 3: make selection one item long (sel: %@ expected: %@ actual: %@)'.fmt(sel, expected, actual));  
   sel = actual;
@@ -166,8 +180,8 @@ test("anchor test 2 - anchor at end", function() {
 // 
 
 test("selectNextItem() when selection is 9..9", function() {
-  var sel = SC.SelectionSet.create().add(content,9),
-      expected = SC.SelectionSet.create().add(content,9),
+  var sel = selectionFromIndex(9),
+      expected = selectionFromIndex(9),
       actual;
       
   view.set('selection', sel);

data/frameworks/sproutcore/frameworks/desktop/tests/views/collection/selectPreviousItem.js

@@ -18,13 +18,27 @@ module("SC.CollectionView.selectPreviousItem", {
   }
 });
 
+/*
+  Creates an SC.SelectionSet from a given index.
+
+  @param {Number} index the index of the content to select
+  @returns {SC.SelectionSet}
+*/
+
+function selectionFromIndex(index) {
+  var ret = SC.SelectionSet.create();
+  ret.addObject(content.objectAt(index));
+
+  return ret;
+}
+
 // ..........................................................
 // BASIC OPERATIONS
 //
 
 test("selectPreviousItem(extend=undefined, numberOfItems=undefined)", function() {
-  var sel = SC.SelectionSet.create().add(content,4),
-      expected = SC.SelectionSet.create().add(content,3),
+  var sel = selectionFromIndex(4),
+      expected = selectionFromIndex(3),
       actual;
       
   view.set('selection', sel);
@@ -35,8 +49,8 @@ test("selectPreviousItem(extend=undefined, numberOfItems=undefined)", function()
 });
 
 test("selectPreviousItem(extend=NO, numberOfItems=undefined)", function() {
-  var sel = SC.SelectionSet.create().add(content,4),
-      expected = SC.SelectionSet.create().add(content,3),
+  var sel = selectionFromIndex(4),
+      expected = selectionFromIndex(3),
       actual;
       
   view.set('selection', sel);
@@ -47,7 +61,7 @@ test("selectPreviousItem(extend=NO, numberOfItems=undefined)", function() {
 });
 
 test("selectPreviousItem(extend=YES, numberOfItems=undefined)", function() {
-  var sel = SC.SelectionSet.create().add(content,4),
+  var sel = selectionFromIndex(4),
       expected = SC.SelectionSet.create().add(content,3,2),
       actual;
       
@@ -59,7 +73,7 @@ test("selectPreviousItem(extend=YES, numberOfItems=undefined)", function() {
 });
 
 test("selectPreviousItem(extend=YES, numberOfItems=2)", function() {
-  var sel = SC.SelectionSet.create().add(content,4),
+  var sel = selectionFromIndex(4),
       expected = SC.SelectionSet.create().add(content,2,3),
       actual;
       
@@ -89,7 +103,7 @@ test("anchor test", function() {
   
   // TRY 2: further reduce selection
   view.selectPreviousItem(YES); 
-  expected = SC.SelectionSet.create().add(content,2,1); 
+  expected = selectionFromIndex(2); 
   actual = view.get('selection');
   ok(expected.isEqual(actual), 'TRY 2: should reduce end of selection again (sel: %@ expected: %@ actual: %@)'.fmt(sel, expected, actual));  
   sel = actual;
@@ -146,7 +160,7 @@ test("anchor test 2", function() {
   
   // TRY 3: don't extend.  jumps to previous item and resets selection
   view.selectPreviousItem(NO); 
-  expected = SC.SelectionSet.create().add(content,3,1); 
+  expected = selectionFromIndex(3); 
   actual = view.get('selection');
   ok(expected.isEqual(actual), 'TRY 3: not extending clears selection and anchor (sel: %@ expected: %@ actual: %@)'.fmt(sel, expected, actual));  
   sel = actual;
@@ -172,8 +186,8 @@ test("anchor test 2", function() {
 // 
 
 test("selectPreviousItem() when selection is 0..0", function() {
-  var sel = SC.SelectionSet.create().add(content,0),
-      expected = SC.SelectionSet.create().add(content,0),
+  var sel = selectionFromIndex(0),
+      expected = selectionFromIndex(0),
       actual;
       
   view.set('selection', sel);

data/frameworks/sproutcore/frameworks/desktop/tests/views/list/rowHeightForContentIndex.js

@@ -65,7 +65,7 @@ test("constant row heights", function() {
 
 test("constant row heights with rowSpacing", function() {
   var view = SC.ListView.create({ content: content, rowHeight: 40, rowSpacing: 2, customRowHeightIndexes: null });
-  verifyRowHeights(view, 42);
+  verifyRowHeights(view, 40);
 });
 
 test("custom row heights", function() {

data/frameworks/sproutcore/frameworks/desktop/tests/views/list/ui_row_heights.js

@@ -116,7 +116,7 @@ test("scrolling by small amount should update incremental rendering", function()
 
   // SCROLL DOWN ANOTHER LINE
   SC.run(function() {
-    scrollView.scrollTo(0,82);
+    scrollView.scrollTo(0,83);
   });
   
   // top line should have scrolled out of view

data/frameworks/sproutcore/frameworks/desktop/tests/views/progress/ui.js

@@ -80,7 +80,10 @@ test("basic", function() {
   ok(view.$('.sc-inner-head'), 'should have sc-inner-head class');
   ok(view.$('.sc-inner-tail'), 'should have sc-inner-tail class');
   equals(view.$('.sc-inner').css("width"), "25%", 'width should be 25%');
-  equals(view.$('.sc-inner').width(), 84, 'pixel width ');
+  
+  // browsers compute the width after % adjustment differently.  just be close
+  var v = (SC.browser.msie || SC.browser.mozilla) ? 85 : 84;
+  equals(view.$('.sc-inner').width(), v, 'pixel width ');
   
 });
 
@@ -173,7 +176,9 @@ test("changing value from full -> negative number", function() {
 test("changing value to over maximum", function() {
   var view = pane.view('progress basic');
   
-  equals(view.$('.sc-inner').width(), 84, 'precon - pixel width should be 84');
+  // browsers compute the width after % adjustment differently.  just be close
+  var v = (SC.browser.msie || SC.browser.mozilla) ? 85 : 84;
+  equals(view.$('.sc-inner').width(), v, 'precon - pixel width should be fixed');
   SC.RunLoop.begin();
   view.set('value', 110);
   SC.RunLoop.end();
@@ -187,7 +192,9 @@ test("changing value to a string", function() {
   SC.RunLoop.begin();
   view.set('value', 25);
   SC.RunLoop.end();
-  equals(view.$('.sc-inner').width(), 84, 'precon - pixel width should be 84');
+
+  var v = (SC.browser.msie || SC.browser.mozilla) ? 85 : 84;
+  equals(view.$('.sc-inner').width(), v, 'precon - pixel width should be fixed');
   SC.RunLoop.begin();
   view.set('value', 'aString');
   SC.RunLoop.end();

data/frameworks/sproutcore/frameworks/desktop/tests/views/radio/methods.js

@@ -5,7 +5,7 @@
 // License:   Licened under MIT license (see license.js)
 // ==========================================================================
 
-/*global module test htmlbody ok equals same stop start */
+/*global module test htmlbody ok equals same stop start Q$*/
 
 var pane, view ;
 module("SC.RadioView Logic", {

data/frameworks/sproutcore/frameworks/desktop/tests/views/scroll/ui.js

@@ -21,7 +21,9 @@
     
     .add("basic3", SC.ScrollView, {
       contentView: iv,
-      isHorizontalScrollerVisible: NO
+      isHorizontalScrollerVisible: NO,
+      autohidesHorizontalScroller: NO,
+      autohidesVerticalScroller: NO
     })
     
     .add("disabled", SC.ScrollView, {
@@ -120,40 +122,60 @@
    test("Setting the scroller to a specific value", function() {
      var viewsc = pane.view('basic2');
      // should be testing against the layer.scrollTop property
+     SC.RunLoop.begin();
      viewsc.scrollTo(0, 10);
-     equals(viewsc.get('verticalScrollOffset'), 10, "After setting the value to the 10 on a vertical scroller, the scrollTop property of the layer must be");
-     equals(viewsc.get('verticalScrollerView').get('layer').scrollTop, 10, "After setting the value to the 10 on a vertical scroller, the scrollTop property of the layer must be");
+     SC.RunLoop.end();
+     equals(viewsc.get('verticalScrollOffset'), 10, "1After setting the value to the 10 on a vertical scroller, the verticalscrollOffset property of the layer must be");
+     equals(viewsc.get('verticalScrollerView').get('layer').scrollTop, 10, "2After setting the value to the 10 on a vertical scroller, the scrollTop property of the layer must be");
+     SC.RunLoop.begin();
      viewsc.scrollTo(0, 0);
-     equals(viewsc.get('verticalScrollOffset'), 0, "After setting the value to the 10 on a vertical scroller, the scrollTop property of the layer must be");
-     equals(viewsc.get('verticalScrollerView').get('layer').scrollTop, 0, "After setting the value to the 10 on a vertical scroller, the scrollTop property of the layer must be");
+     SC.RunLoop.end();
+     equals(viewsc.get('verticalScrollOffset'), 0, "1After setting the value to the 0 on a vertical scroller, the verticalscrollOffset property of the layer must be");
+     equals(viewsc.get('verticalScrollerView').get('layer').scrollTop, 0, "2After setting the value to the 0 on a vertical scroller, the scrollTop property of the layer must be");
+     SC.RunLoop.begin();
      viewsc.scrollTo(0, 100);
-     equals(viewsc.get('verticalScrollOffset'), 100, "After setting the value to the 10 on a vertical scroller, the scrollTop property of the layer must be");
-     equals(viewsc.get('verticalScrollerView').get('layer').scrollTop, 100, "After setting the value to the 10 on a vertical scroller, the scrollTop property of the layer must be");
+     SC.RunLoop.end();
+     equals(viewsc.get('verticalScrollOffset'), 100, "1After setting the value to the 100 on a vertical scroller, the verticalscrollOffset property of the layer must be");
+     equals(viewsc.get('verticalScrollerView').get('layer').scrollTop, 100, "2After setting the value to the 100 on a vertical scroller, the scrollTop property of the layer must be");
+     SC.RunLoop.begin();
      viewsc.scrollTo(0, -1);
-     equals(viewsc.get('verticalScrollOffset'), 0, "After setting the value to the 10 on a vertical scroller, the scrollTop property of the layer must be");
-     equals(viewsc.get('verticalScrollerView').get('layer').scrollTop, 0, "After setting the value to the 10 on a vertical scroller, the scrollTop property of the layer must be");
+     SC.RunLoop.end();
+     equals(viewsc.get('verticalScrollOffset'), 0, "1After setting the value to the -1 on a vertical scroller, the verticalscrollOffset property of the layer must be");
+     equals(viewsc.get('verticalScrollerView').get('layer').scrollTop, 0, "2After setting the value to the -1 on a vertical scroller, the scrollTop property of the layer must be");
+     SC.RunLoop.begin();
      viewsc.scrollTo(0, 101);
-     equals(viewsc.get('verticalScrollOffset'), 101, "After setting the value to the 10 on a vertical scroller, the scrollTop property of the layer must be");
-     equals(viewsc.get('verticalScrollerView').get('layer').scrollTop, 101, "After setting the value to the 10 on a vertical scroller, the scrollTop property of the layer must be");
+     SC.RunLoop.end();
+     equals(viewsc.get('verticalScrollOffset'), 101, "1After setting the value to the 101 on a vertical scroller, the verticalscrollOffset property of the layer must be");
+     equals(viewsc.get('verticalScrollerView').get('layer').scrollTop, 101, "2After setting the value to the 101 on a vertical scroller, the scrollTop property of the layer must be");
 
      // should be testing against the layer.scrollLeft property
-    viewsc.set('layoutDirection', SC.LAYOUT_HORIZONTAL);
-    viewsc.scrollTo(10, 0);
-    equals(viewsc.get('horizontalScrollOffset'), 10, "After setting the value to the 10 on a vertical scroller, the scrollTop property of the layer must be");
-    equals(viewsc.get('horizontalScrollerView').get('layer').scrollLeft, 10, "After setting the value to the 10 on a vertical scroller, the scrollTop property of the layer must be");
-    viewsc.scrollTo(0, 0);
-    equals(viewsc.get('horizontalScrollOffset'), 0, "After setting the value to the 10 on a vertical scroller, the scrollTop property of the layer must be");
-    equals(viewsc.get('horizontalScrollerView').get('layer').scrollLeft, 0, "After setting the value to the 10 on a vertical scroller, the scrollTop property of the layer must be");
-    viewsc.scrollTo(50, 0);
-    equals(viewsc.get('horizontalScrollOffset'), 50, "After setting the value to the 10 on a vertical scroller, the scrollTop property of the layer must be");
-    equals(viewsc.get('horizontalScrollerView').get('layer').scrollLeft, 50, "After setting the value to the 10 on a vertical scroller, the scrollTop property of the layer must be");
-    viewsc.scrollTo( - 1, 0);
-    equals(viewsc.get('horizontalScrollOffset'), 0, "After setting the value to the 10 on a vertical scroller, the scrollTop property of the layer must be");
-    equals(viewsc.get('horizontalScrollerView').get('layer').scrollLeft, 0, "After setting the value to the 10 on a vertical scroller, the scrollTop property of the layer must be");
-    viewsc.scrollTo(101, 0);
-    equals(viewsc.get('horizontalScrollOffset'), 73, "After setting the value to the 10 on a vertical scroller, the scrollTop property of the layer must be");
-    equals(viewsc.get('horizontalScrollerView').get('layer').scrollLeft, 73, "After setting the value to the 10 on a vertical scroller, the scrollTop property of the layer must be");
-   });
+     viewsc.set('layoutDirection', SC.LAYOUT_HORIZONTAL);
+     SC.RunLoop.begin();
+     viewsc.scrollTo(10, 0);
+     SC.RunLoop.end();
+     equals(viewsc.get('horizontalScrollOffset'), 10, "After setting the value to the 10 on a horizontal scroller, the horizontalScrollOffset property of the layer must be");
+     equals(viewsc.get('horizontalScrollerView').get('layer').scrollLeft, 10, "After setting the value to the 10 on a horizontal scroller, the scrollLeft property of the layer must be");
+     SC.RunLoop.begin();
+     viewsc.scrollTo(0, 0);
+     SC.RunLoop.end();
+     equals(viewsc.get('horizontalScrollOffset'), 0, "After setting the value to the 0 on a horizontal scroller, the horizontalScrollOffset property of the layer must be");
+     equals(viewsc.get('horizontalScrollerView').get('layer').scrollLeft, 0, "After setting the value to the 0 on a horizontal scroller, the scrollLeft property of the layer must be");
+     SC.RunLoop.begin();
+     viewsc.scrollTo(50, 0);
+     SC.RunLoop.end();
+     equals(viewsc.get('horizontalScrollOffset'), 50, "After setting the value to the 50 on a horizontal scroller, the horizontalScrollOffset property of the layer must be");
+     equals(viewsc.get('horizontalScrollerView').get('layer').scrollLeft, 50, "After setting the value to the 50 on a horizontal scroller, the scrollLeft property of the layer must be");
+     SC.RunLoop.begin();
+     viewsc.scrollTo( - 1, 0);
+     SC.RunLoop.end();
+     equals(viewsc.get('horizontalScrollOffset'), 0, "After setting the value to the -1 on a horizontal scroller, the horizontalScrollOffset property of the layer must be");
+     equals(viewsc.get('horizontalScrollerView').get('layer').scrollLeft, 0, "After setting the value to the -1 on a horizontal scroller, the scrollLeft property of the layer must be");
+     SC.RunLoop.begin();
+     viewsc.scrollTo(101, 0);
+     SC.RunLoop.end();
+     equals(viewsc.get('horizontalScrollOffset'), 73, "After setting the value to the 101 on a horizontal scroller, the horizontalScrollOffset property of the layer must be");
+     equals(viewsc.get('horizontalScrollerView').get('layer').scrollLeft, 73, "After setting the value to the 101 on a horizontal scroller, the scrollLeft property of the layer must be");
+  });
    
    
    test("non-zero bottom in vertical scrollbar", function() {

data/frameworks/sproutcore/frameworks/desktop/tests/views/scroller/methods.js

@@ -24,7 +24,7 @@ module("SC.ScrollerView",{
 		SC.ScrollerView.extend({	
       layout:{ top: 0, bottom: 0, right: 0, width: 20 },	     
 		  minimum:0,
-		  maximum:100,
+		  maximum:100
 		})
 
 	  ]	
@@ -47,9 +47,9 @@ test("listing the displayProperties",function(){
   equals(obj.length, 5,'the number of display properties');
   equals(obj[0],'isFirstResponder','the offset value property');
   equals(obj[1],'isVisible','the isVisible value property');
-  equals(obj[2],'minimum','the minimum value property');	  
-  equals(obj[3],'maximum','the maximum value property');	  
-  equals(obj[4],'isEnabled','the isEnabled offset value property');	  
+  equals(obj[2],'maximum','the maximum value property');	  
+  equals(obj[3],'isEnabled','the isEnabled offset value property');	  
+  equals(obj[4],'layoutDirection','the layoutDirection property');	  
 
 });
 
@@ -59,8 +59,8 @@ test("testing properties of a scrollerview", function(){
   equals(NO,view1.get('isEnabled'),'The scroller should be not enabled');
   equals(SC.LAYOUT_VERTICAL,view.get('layoutDirection'),'The default scroller direction should be vertical');
   equals(SC.LAYOUT_HORIZONTAL,view1.get('layoutDirection'),'The scroller direction set as vertical during view creation');
-  equals(0,view.value,'The default offset value set during creation for a scroller should be 0');
-  equals(15,view1.value,'The offset value should be 15');
+  equals(0,view.get('value'),'The default offset value set during creation for a scroller should be 0');
+  equals(15,view1.get('value'),'The offset value should be 15');
   // view1.set('layoutDirection',SC.LAYOUT_VERTICAL);
   // equals(SC.LAYOUT_VERTICAL,view1.get('layoutDirection'),'The scroller direction set after view creation');
 });

data/frameworks/sproutcore/frameworks/desktop/tests/views/segmented/methods.js

@@ -8,7 +8,7 @@
 /*global module test htmlbody ok equals same stop start */
 
 var iconURL= "http://www.freeiconsweb.com/Icons/16x16_people_icons/People_046.gif";
-
+var pane, view;
 module("SC.SegmentedView", {
   setup: function() {
     SC.RunLoop.begin();
@@ -74,12 +74,12 @@ test("Check that properties are mapped correctly", function() {
    equals(view._isMouseDown, YES, 'Mouse down flag on mousedown should be ');
    equals(view.get('activeIndex'), 0, 'The active item is the first segment.');
    
-   var elem = view.get('layer').childNodes[1];
+   elem = view.get('layer').childNodes[1];
    SC.Event.trigger(elem, 'mouseup');
    equals(view._isMouseDown, NO, 'Mouse down flag on mouseup should be ');
    equals(view.get('activeIndex'), -1, 'Ther shouldnt be any active item');
    
-   var elem = view.get('layer').childNodes[2];
+   elem = view.get('layer').childNodes[2];
    SC.Event.trigger(elem, 'mousedown');
     
    SC.Event.trigger(elem, 'mousemoved');

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

@@ -142,8 +142,8 @@ htmlbody('<style> .sc-static-layout { border: 1px red dotted; } </style>');
     ok(viewElem.hasClass('sc-view'), '3_empty.hasClass(sc-view) should be YES');
     ok(viewElem.hasClass('sc-segmented-view'), '3_empty.hasClass(sc-segmented-view) should be YES');
     for (var i=0, ilen=segments.length; i<ilen; i++){
-      seg=segments[i];
-      if(i==0){
+      var seg=segments[i];
+      if(i===0){
         ok((seg.className.indexOf('sc-first-segment')>=0), 'first segment has the right classname assigned.');
       }    
       if(i==segments.length-1){
@@ -152,7 +152,7 @@ htmlbody('<style> .sc-static-layout { border: 1px red dotted; } </style>');
       ok((seg.childNodes[0].className.indexOf('sc-button-inner')>=0), 'segment '+i+' should have an inner-button.');
       ok((seg.childNodes[0].childNodes[0].className.indexOf('sc-button-label')>=0), 'segment '+i+' should have a label.');
         
-      if(i!=0 && i!=segments.length-1){
+      if(i!==0 && i!=segments.length-1){
         ok((seg.className.indexOf('sc-middle-segment')>=0), 'middle segment has the right classname assigned.');
       }
       viewElem=pane.view('3_items,2_sel,disabled').$();
@@ -168,8 +168,8 @@ htmlbody('<style> .sc-static-layout { border: 1px red dotted; } </style>');
     ok(viewElem.hasClass('sc-view'), '3_empty.hasClass(sc-view) should be YES');
     ok(viewElem.hasClass('sc-segmented-view'), '3_empty.hasClass(sc-segmented-view) should be YES');
     for (var i=0, ilen=segments.length; i<ilen; i++){
-      seg=segments[i];
-      if(i==0){
+      var seg=segments[i];
+      if(i===0){
         ok((seg.className.indexOf('sc-first-segment')>=0), 'first segment has the right classname assigned.');
       }    
       if(i==segments.length-1){
@@ -179,7 +179,7 @@ htmlbody('<style> .sc-static-layout { border: 1px red dotted; } </style>');
       ok((seg.childNodes[0].childNodes[0].className.indexOf('sc-button-label')>=0), 'segment '+i+' should have a label.');
       ok((seg.childNodes[0].childNodes[0].childNodes[0].src.length>0), 'segment '+i+' should have an icon.');
         
-      if(i!=0 && i!=segments.length-1){
+      if(i!==0 && i!=segments.length-1){
         ok((seg.className.indexOf('sc-middle-segment')>=0), 'middle segment has the right classname assigned.');
       }
       viewElem=pane.view('3_items,2_sel,disabled').$();
@@ -192,7 +192,7 @@ htmlbody('<style> .sc-static-layout { border: 1px red dotted; } </style>');
   test("Check that the selected segments have the right classes assigned.", function() {
     var segments=pane.view('3_empty').$('a');
     for (var i=0, ilen=segments.length; i<ilen; i++){
-      seg=segments[i];
+      var seg=segments[i];
       ok((seg.className.indexOf('sel')==-1), 'this element should not be selected.');
     }
 
@@ -203,7 +203,7 @@ htmlbody('<style> .sc-static-layout { border: 1px red dotted; } </style>');
     var segments=pane.view('3_items,icon,2_sel').$('a');
     var count=0;
     for (var i=0, ilen=segments.length; i<ilen; i++){
-      seg=segments[i];
+      var seg=segments[i];
       if(seg.className.indexOf('sel')!=-1){
         count++;
       }