sproutcore 1.7.1.beta → 1.8.0

data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/list/rowDelegate.js

@@ -95,7 +95,7 @@ test("modifying delegate and content", function() {
   callCount=0;
   SC.run(function() { view.set('delegate', null); });
   ok(callCount>0, 'rowDelegate should change when setting delegate');
-  equals(view.get('rowDelegate'), view, 'rowDelegate should go back to view when delegate and content cleared or dont implement');
+  equals(view.get('rowDelegate'), view, 'rowDelegate should go back to view when delegate and content cleared or do not implement');
   
 });
 
@@ -106,7 +106,7 @@ test("modifying delegate and content", function() {
 test("changing the rowHeight should invalidate all row heights", function() {
   var indexes = null;
   view = SC.ListView.create({
-    content:  '1 2 3 4 5'.w(), // provide some contnet
+    content:  '1 2 3 4 5'.w(), // provide some content
     delegate: del,
     
     // override for testing
@@ -137,7 +137,7 @@ test("changing the rowHeight should invalidate all row heights", function() {
 test("changing the customRowHeightIndexes should invalidate impacted row heights", function() {
   var indexes = null;
   view = SC.ListView.create({
-    content:  '1 2 3 4 5'.w(), // provide some contnet
+    content:  '1 2 3 4 5'.w(), // provide some content
     delegate: del,
     
     // override for testing

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

@@ -78,31 +78,31 @@ var pane = SC.ControlTestPane.design()
     maximum: 100,
     isEnabled: NO
   })
-  
+
   // Slider View UI
   .add("slider basic", SC.SliderView, {
     layout: {top:0, bottom:0, left:0, width: 250},
-    value: 50, 
-    minimum: 0, 
+    value: 50,
+    minimum: 0,
     maximum: 100
   })
   .add("slider disabled", SC.SliderView, {
     layout: {top:0, bottom:0, left:0, width: 250},
-    value: 50, 
-    minimum: 0, 
+    value: 50,
+    minimum: 0,
     maximum: 100,
     isEnabled: NO
   })
   .add("slider value 100", SC.SliderView, {
     layout: {top:0, bottom:0, left:0, width: 250},
-    value: 100, 
-    minimum: 0, 
+    value: 100,
+    minimum: 0,
     maximum: 100
   })
   .add("slider basic step 20", SC.SliderView, {
     layout: {top:0, bottom:0, left:0, width: 250},
-    value: 50, 
-    minimum: 0, 
+    value: 50,
+    minimum: 0,
     maximum: 100,
     step: 20
   })
@@ -145,7 +145,7 @@ var pane = SC.ControlTestPane.design()
 
 // ..........................................................
 // TEST VIEWS
-// 
+//
 module("SC.ProgressView UI", {
   setup: function(){
     htmlbody('<style> .sc-static-layout { border: 1px red dotted; } </style>');
@@ -158,62 +158,65 @@ module("SC.ProgressView UI", {
 });
 
 test("basic", function() {
-  
+
   var view = pane.view('progress basic');
-  
+
   ok(!view.$().hasClass('disabled'), 'should NOT have disabled class');
-  ok(view.$('.track'), 'should have track class');
-  ok(view.$('.content'), 'should have content class');
+  ok(view.$('.track').length > 0, 'should have track class');
+  ok(view.$('.content').length > 0, 'should have content class');
   equals(view.$('.content')[0].style.width, "25%", 'width should be 25%');
-  
+
   // browsers compute the width after % adjustment differently.  just be close
-  var v = (SC.browser.msie || SC.browser.mozilla) ? 63 : 62;
+  var v = (SC.browser.isIE || SC.browser.isMozilla) ? 63 : 62;
   equals(view.$('.content').width(), v, 'pixel width ');
-  
+
 });
 
 test("disabled", function() {
-  
+
   var view = pane.view('progress disabled');
-  
+
   ok(view.$().hasClass('disabled'), 'should have disabled class');
-  ok(view.$('.content'), 'should have content class');
+  ok(view.$('.content').length > 0, 'should have content class');
   equals(view.$('.content')[0].style.width, "0%", 'width should be 0%');
   equals(view.$('.content').width(), 0, 'pixel width ');
-  
+
 });
 
 test("basic value 0", function() {
-  
+
   var view = pane.view('progress basic value 0');
-  
+
   ok(!view.$().hasClass('disabled'), 'should NOT have disabled class');
-  ok(view.$('.content'), 'should have content class');
+  ok(view.$('.content').length > 0, 'should have content class');
   equals(view.$('.content')[0].style.width, "0%", 'width should be 0%');
   equals(view.$('.content').width(), 0, 'pixel width ');
-  
+
 });
 
 test("basic value 100", function() {
-  
+
   var view = pane.view('progress basic value 100');
-  
+
   ok(!view.$().hasClass('disabled'), 'should NOT have disabled class');
-  ok(view.$('.content'), 'should have content class');
+  ok(view.$('.content').length > 0, 'should have content class');
   equals(view.$('.content')[0].style.width, "100%", 'width should be 100%');
   equals(view.$('.content').width(), 250, 'pixel width ');
-  
+
+  // Check that the sc-complete class is added
+  ok(view.$().hasClass('sc-complete'), 'should have sc-complete class');
+
 });
 
 test("basic max 50", function() {
-  
+
   var view = pane.view('progress basic max 50');
-  
+
   ok(!view.$().hasClass('disabled'), 'should NOT have disabled class');
-  ok(view.$('.content'), 'should have content class');
+  ok(view.$('.content').length > 0, 'should have content class');
   equals(view.$('.content')[0].style.width, "50%", 'width should be 50%');
   equals(view.$('.content').width(), 125, 'pixel width ');
-  
+
 });
 
 // ..........................................................
@@ -222,13 +225,13 @@ test("basic max 50", function() {
 
 test("changing value from empty -> value", function() {
   var view = pane.view('progress basic value 0');
-  
+
   equals(view.$('.content').width(), 0, 'precon - pixel width should be 0');
   SC.RunLoop.begin();
   view.set('value', 50);
   SC.RunLoop.end();
   equals(view.$('.content')[0].style.width, "50%", 'width should be 50%');
-  
+
   var assertions = function(){
     equals(view.$('.content').width(), 125, 'pixel width ');
     start();
@@ -240,7 +243,10 @@ test("changing value from empty -> value", function() {
 
 test("changing value from full -> empty", function() {
   var view = pane.view('progress basic value 100');
-  
+
+  // Check that the sc-complete class is added
+  ok(view.$().hasClass('sc-complete'), 'should have sc-complete class');
+
   equals(view.$('.content').width(), 250, 'precon - pixel width should be 316');
   SC.RunLoop.begin();
   view.set('value', 0);
@@ -253,18 +259,21 @@ test("changing value from full -> empty", function() {
 
   stop();
   setTimeout(assertions, 200);
-  
-  
+
+
 });
 
 
 test("changing value from full -> negative number", function() {
   var view = pane.view('progress basic value 100');
-	
+
   SC.RunLoop.begin();
   view.set('value', 100);
   SC.RunLoop.end();
-  
+
+  // Check that the sc-complete class is added
+  ok(view.$().hasClass('sc-complete'), 'should have sc-complete class');
+
   SC.RunLoop.begin();
   view.set('value', -10);
   SC.RunLoop.end();
@@ -281,14 +290,18 @@ test("changing value from full -> negative number", function() {
 
 test("changing value to over maximum", function() {
   var view = pane.view('progress basic');
-  
+
   // browsers compute the width after % adjustment differently.  just be close
-  var v = (SC.browser.msie || SC.browser.mozilla) ? 63 : 62;
+  var v = (SC.browser.isIE || SC.browser.isMozilla) ? 63 : 62;
   equals(view.$('.content').width(), v, 'precon - pixel width should be fixed');
   SC.RunLoop.begin();
   view.set('value', 110);
   SC.RunLoop.end();
   equals(view.$('.content')[0].style.width, "100%", 'width should be 100%');
+
+  // Check that the sc-complete class is added
+  ok(view.$().hasClass('sc-complete'), 'should have sc-complete class');
+
   var assertions = function(){
     equals(view.$('.content').width(), 250, 'pixel width ');
     start();
@@ -300,7 +313,7 @@ test("changing value to over maximum", function() {
 
 test("changing value to a string", function() {
   var view = pane.view('progress basic');
-  
+
   SC.RunLoop.begin();
   view.set('value', 25);
   SC.RunLoop.end();
@@ -352,37 +365,37 @@ module("SC.SliderView UI", pane.standardSetup());
 
 test("basic", function() {
   var view = pane.view('slider basic');
-  
+
   ok(!view.$().hasClass('disabled'), 'should NOT have disabled class');
-  ok(view.$('.sc-inner'), 'should have sc-inner class');
-  ok(view.$('.sc-handle'), 'should have sc-handle class');
+  ok(view.$('.track').length > 0, 'should have track classed element');
+  ok(view.$('.sc-handle').length > 0, 'should have sc-handle classed element');
   equals(view.$('.sc-handle')[0].style.left, '50%', 'left of sc-handle should be 50%');
 });
 
 test("disabled", function() {
   var view = pane.view('slider disabled');
-  
+
   ok(view.$().hasClass('disabled'), 'should have disabled class');
-  ok(view.$('.sc-inner'), 'should have sc-inner class');
-  ok(view.$('.sc-handle'), 'should have sc-handle class');
+  ok(view.$('.track').length > 0, 'should have track classed element');
+  ok(view.$('.sc-handle').length > 0, 'should have sc-handle classed element');
   equals(view.$('.sc-handle')[0].style.left, '50%', 'left of sc-handle should be 50%');
 });
 
 test("basic value 100", function() {
   var view = pane.view('slider value 100');
-  
+
   ok(!view.$().hasClass('disabled'), 'should have disabled class');
-  ok(view.$('.sc-inner'), 'should have sc-inner class');
-  ok(view.$('.sc-handle'), 'should have sc-handle class');
+  ok(view.$('.track').length > 0, 'should have track classed element');
+  ok(view.$('.sc-handle').length > 0, 'should have sc-handle classed element');
   equals(view.$('.sc-handle')[0].style.left, '100%', 'left of sc-handle should be 100%');
 });
 
 test("basic step 20", function() {
   var view = pane.view('slider basic step 20');
-  
+
   ok(!view.$().hasClass('disabled'), 'should have disabled class');
-  ok(view.$('.sc-inner'), 'should have sc-inner class');
-  ok(view.$('.sc-handle'), 'should have sc-handle class');
+  ok(view.$('.track').length > 0, 'should have track classed element');
+  ok(view.$('.sc-handle').length > 0, 'should have sc-handle classed element');
   equals(view.$('.sc-handle')[0].style.left, '60%', 'left of sc-handle should be 60%');
 });
 
@@ -406,11 +419,6 @@ test("Check if attribute aria-valuenow is set correctly", function() {
   equals(viewElem.attr('aria-valuenow'), 40, 'aria-valuenow should be 40');
 });
 
-test("Check if attribute aria-valuetext is set correctly", function() {
-  var viewElem = pane.view('slider aria-valuetext').$();
-  equals(viewElem.attr('aria-valuetext'), 20, 'aria-valuetext should be 20');
-});
-
 test("Check if attribute aria-orientation is set correctly", function() {
   var viewElem = pane.view('slider aria-orientation').$();
   equals(viewElem.attr('aria-orientation'), "horizontal", 'aria-orientation should be horizontal');

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

@@ -18,14 +18,29 @@ module("SC.RadioView Logic", {
           items: 'Red Green'.w(),
           value: 'Red',
           isEnabled: YES
+        }),
+        SC.RadioView.extend({
+          layout: { right: 20, bottom: 20, width: 100, height: 23 },
+          itemTitleKey: 'title',
+          itemIsEnabledKey: 'enabled',
+          items: [{
+            title: 'Sugar',
+            enabled: NO
+          }, {
+            title: 'Salt',
+            enabled: NO
+          }, {
+            title: 'Salgar',
+            enabled: YES
+          }]
         })]
     });
     pane.append(); // make sure there is a layer...
     SC.RunLoop.end();
-    
+
     view = pane.childViews[0];
-  }, 
-  
+  },
+
   teardown: function() {
     pane.remove();
     pane = view = null ;
@@ -59,11 +74,11 @@ test("isEnabled should alter group classname and sync with isEnabled property",
   ok(view.get('isEnabled'), 'isEnabled should match value');
   ok(!view.$().hasClass('disabled'), 'should NOT have disabled class');
 
-  // update value -- make sure isEnabled changes.  
+  // update value -- make sure isEnabled changes.
   SC.RunLoop.begin();
   view.set('isEnabled', 0); // make falsy. (but not NO exactly)
   SC.RunLoop.end();
-  
+
   ok(!view.get('isEnabled'), 'isEnabled should now be NO');
   ok(view.$().hasClass('disabled'), 'should have disabled class');
 
@@ -71,7 +86,7 @@ test("isEnabled should alter group classname and sync with isEnabled property",
   SC.RunLoop.begin();
   view.set('isEnabled', YES);
   SC.RunLoop.end();
-  
+
   ok(view.get('isEnabled'), 'isEnabled should match value');
   ok(!view.$().hasClass('disabled'), 'should NOT have disabled class');
 });
@@ -85,23 +100,23 @@ test("clicking on a radio button will change toggle the value", function() {
 });
 
 test("pressing mouseDown and then mouseUp anywhere in a radio button should toggle the selection", function() {
-  var elem = view.get('layer'), 
+  var elem = view.get('layer'),
       r = view.$('.sc-radio-button');
 
   SC.Event.trigger(r[0], 'mousedown');
   equals(view.get('value'), 'Red', 'value should not change yet');
   ok(r.first().hasClass('active'), 'radio button should be active');
-  
+
   // simulate mouseUp and browser-native change to control
   SC.Event.trigger(r[0],'mouseup');
   //input.attr('checked', NO);
   // loose focus of the element since it was changed
   SC.Event.trigger(r[1],'mousedown');
   SC.Event.trigger(r[1],'mouseup');
-  
+
   ok(!r.first().hasClass('active'), 'radio button should no longer be active');
   equals(view.get('value'), 'Green', 'value should be undefined (none checked)');
-  
+
   elem = null ;
 });
 
@@ -109,11 +124,41 @@ test("isEnabled=NO should add disabled attr to input", function() {
   SC.RunLoop.begin();
   view.set('isEnabled', NO);
   SC.RunLoop.end();
-  
+
   ok(view.$().hasClass('disabled'), 'should have disabled attr');
-  
+
   ok(view.get('value'), 'precond - value should be true');
   view.mouseDown();
   view.mouseUp();
   ok(view.get('value'), 'value should not change when clicked');
 });
+
+test("disabled radio buttons do not become selected on click", function () {
+  view = pane.childViews[1];
+
+  var elem = view.get('layer'),
+      r = view.$('.sc-radio-button');
+
+  SC.Event.trigger(r[0], 'mousedown');
+  ok(!r.first().hasClass('active'), 'radio button should not be active');
+
+  // simulate mouseUp and browser-native change to control
+  SC.Event.trigger(r[0],'mouseup');
+  ok(!r.first().hasClass('active'), 'radio button should not be active');
+  equals(r.first().attr('aria-checked'), 'false', 'radio button should not be checked');
+  equals(view.get('value'), undefined, "value should be undefined (nothing is checked)");
+
+  // lose focus of the element since it was changed
+  SC.Event.trigger(r[1],'mousedown');
+  SC.Event.trigger(r[1],'mouseup');
+
+  equals(view.get('value'), undefined, "value should be undefined (nothing is checked)");
+
+  // last one is selectable
+  SC.Event.trigger(r[2],'mousedown');
+  SC.Event.trigger(r[2],'mouseup');
+
+  equals(view.get('value'), view.items[2], "value should be 'Salgar'");
+
+  elem = null ;
+});

data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/scroll/integration.js

@@ -1,27 +1,29 @@
 module("SC.ScrollView integration");
 
 test("should work with SC.TemplateView", function() {
-  var pane = SC.MainPane.create({
-    childViews: ['scrollView'],
 
-    scrollView: SC.ScrollView.design({
-      layout: { width: 400, height: 600 },
 
-      contentView: SC.TemplateView.create({
-        template: SC.Handlebars.compile("foo bar baz")
-      })
-    })
-  });
-
-  pane.append();
-  var exceptionThrown = false;
-  try {
-    SC.RunLoop.begin().end();
-  } catch (e) {
-    exceptionThrown = true;
-  }
-  ok(!exceptionThrown, "Does not throw an exception at the end of the run loop.");
-  pane.remove();
+  // var pane = SC.MainPane.create({
+  //   childViews: ['scrollView'],
+  // 
+  //   scrollView: SC.ScrollView.design({
+  //     layout: { width: 400, height: 600 },
+  // 
+  //     contentView: SC.TemplateView.create({
+  //       template: SC.Handlebars.compile("foo bar baz")
+  //     })
+  //   })
+  // });
+  // 
+  // pane.append();
+  // var exceptionThrown = false;
+  // try {
+  //   SC.RunLoop.begin().end();
+  // } catch (e) {
+  //   exceptionThrown = true;
+  // }
+  // ok(!exceptionThrown, "Does not throw an exception at the end of the run loop.");
+  // pane.remove();
 });
 
 test("should work with views that have static layout applied", function() {