Changeset 9036

Timestamp:

03/16/08 18:53:51 (7 months ago)

Author:

tobie

Message:

prototype: Remove usage of the statement from unit tests.

Files:

• spinoffs/prototype/trunk/CHANGELOG (modified) (1 diff)
• spinoffs/prototype/trunk/ext/update_helper/prototype_update_helper.html (modified) (2 diffs)
• spinoffs/prototype/trunk/test/unit/ajax.html (modified) (17 diffs)
• spinoffs/prototype/trunk/test/unit/array.html (modified) (2 diffs)
• spinoffs/prototype/trunk/test/unit/base.html (modified) (10 diffs)
• spinoffs/prototype/trunk/test/unit/dom.html (modified) (17 diffs)
• spinoffs/prototype/trunk/test/unit/element_mixins.html (modified) (2 diffs)
• spinoffs/prototype/trunk/test/unit/enumerable.html (modified) (5 diffs)
• spinoffs/prototype/trunk/test/unit/event.html (modified) (8 diffs)
• spinoffs/prototype/trunk/test/unit/form.html (modified) (10 diffs)
• spinoffs/prototype/trunk/test/unit/hash.html (modified) (2 diffs)
• spinoffs/prototype/trunk/test/unit/number.html (modified) (1 diff)
• spinoffs/prototype/trunk/test/unit/position.html (modified) (1 diff)
• spinoffs/prototype/trunk/test/unit/range.html (modified) (3 diffs)
• spinoffs/prototype/trunk/test/unit/selector.html (modified) (2 diffs)
• spinoffs/prototype/trunk/test/unit/string.html (modified) (7 diffs)
• spinoffs/prototype/trunk/test/unit/unit_tests.html (modified) (2 diffs)

spinoffs/prototype/trunk/CHANGELOG

@@ +1 @@
+* Remove usage of the `with` statement from unit tests. [Tobie Langel]
+
-* Complete rewrite of the deprecation helper, now renamed UpdateHelper and useable by third-party libs. [Tobie Langel]
-

spinoffs/prototype/trunk/ext/update_helper/prototype_update_helper.html

@@ -77 +77 @@
-  
-  new Test.Unit.Runner({
-{ with(this)
-
-}
-
-{ with(this)
+
+this.
+
+
+
-      Toggle.display('foo');
-
+this.
-        
-      Element.show('foo', 'bar', 'bla');
-
+this.
-        'Use [id_1, id_2, ...].each(Element.show) or $(id_1, id_2, ...).invoke("show") instead.');
-      
-      $('foo', 'bar', 'bla').each(Element.hide);
-
+this.
-      
-      Element.show('foo');
-
+this.
-      
-      Element.hide('foo', 'bar', 'bla');
-
+this.
-        'Use [id_1, id_2, ...].each(Element.hide) or $(id_1, id_2, ...).invoke("hide") instead.');
-      
-      Element.toggle('foo', 'bar', 'bla');
-
+this.
-        'Use [id_1, id_2, ...].each(Element.toggle) or $(id_1, id_2, ...).invoke("toggle") instead.');
-}
-
-{ with(this)
+
+
+
-      Element.setStyle('foo', { 'fontSize': '18px' });
-
+this.
-      
-      Element.setStyle('foo', { 'font-size': '18px' });
-
+this.
-        'Use either camelized style-property names or a regular CSS string instead (see online documentation).')
-      
-      Element.setStyle('foo', 'font-size: 18px;');
-
+this.
-      
-      $('foo').setStyle({ 'font-size': '18px' });
-
+this.
-        'Use either camelized style-property names or a regular CSS string instead (see online documentation).')
-}
-
-{ with(this)
+
+
+
-      new Element.ClassNames('foo');
-
+this.
-      
-      $('foo').classNames();
-
+this.
-        'If you need to access CSS class names as an array, try: $w(element.classname).')
-
-      Element.getElementsByClassName('foo', 'className');
-
+this.
-      
-      document.getElementsByClassName('className');
-
-}
-
-{ with(this)
+this.
+
+
+
-      Element.childOf('foo', 'bar');
-
+this.
-
-      $('foo').immediateDescendants();
-
+this.
-      
-      $('foo').getElementsBySelector('a');
-
+this.
-
-      $('foo').select('a');
-
-}
-
-{ with(this)
+this.
+
+
+
-      Field.clear('foo', 'bar', 'bla');
-
+this.
-        'Use [id_1, id_2, ...].each(Form.Element.clear) or $(id_1, id_2, ...).invoke("clear") instead.');
-        
-      Field.present('foo', 'bar', 'bla');
-
+this.
-        'Use [id_1, id_2, ...].each(Form.Element.present) or $(id_1, id_2, ...).invoke("present") instead.');
-}
-
-{ with(this)
+
+
+
-      Insertion.Before('foo', 'text');
-
+this.
-
-      Insertion.Top('foo', 'text');
-
+this.
-
-      Insertion.Bottom('foo', 'text');
-
+this.
-
-      Insertion.After('foo', 'text');
-
-}
-
-{ with(this)
+this.
+
+
+
-      Position.prepare('foo');
-
+this.
-
-      Position.within('foo');
-
+this.
-
-      Position.withinIncludingScrolloffsets('foo');
-
+this.
-
-      Position.overlap('foo');
-
+this.
-
-      Position.cumulativeOffset('foo');
-
+this.
-
-      Position.positionedOffset('foo');
-
+this.
-
-      Position.absolutize('foo');
-
+this.
-
-      Position.relativize('foo');
-
+this.
-
-      Position.realOffset('foo');
-
+this.
-
-      Position.offsetParent('foo');
-
+this.
-
-      Position.page('foo');
-
+this.
-
-      Position.clone('foo', 'bar');
-
-}
-
-{ with(this)
+this.
+
+
+
-      Event.unloadCache();
-
-}
-
-{ with(this)
+this.
+
+
+
-      Hash.toQueryString({});
-
+this.
-        'Use the instance method Hash#toQueryString or Object.toQueryString instead.');
-
-     Hash.toJSON({});
-
+this.
-        'Use the instance method Hash#toJSON or Object.toJSON instead.');
-      
@@ -228 +228 @@
-      
-      h.remove('foo');
-
+this.
-        'Please note that Hash#unset only accepts one argument.');
-      
-      h.merge('foo');
-
+this.
-      
-      h['foo'];
-
+this.
-        'Please use Hash#get(\'foo\') instead.')
-      
-      h.foo = 3;
-
+this.
-        'Please use Hash#set(\'foo\', 3) instead.')
-        
-      h.bar = 'bar';
-      h.toJSON();
-
+this.
-        'Please use Hash#set(\'bar\', \'bar\') instead.')
-        
-      h.bar;
-
+this.
-        'Please use Hash#get(\'bar\') instead.')
-        
-      h.baz = 'baz';
-      h.bar;
-
+this.
-        'Please use Hash#set(\'baz\', \'baz\') instead.')
-      
-      h.set('toJSON', 'arg'); // make sure hash methods are not overwritten
-
-}
-
-{ with(this)
+this.
+
+
+
-      Class.create();
-
+this.
-        'You can find more about it here: http://prototypejs.org/learn/class-inheritance');
-      Class.create({});
-
-}
-
-{ with(this)
+this.
+
+
+
-      prototypeUpdateHelper.logLevel = UpdateHelper.Warn;
-      var h = $H({ foo: 2 });
-      
-      h.merge({ foo: 3 });
-
+this.
-      
-      h.remove('foo');
-
+this.
-        'Please note that Hash#unset only accepts one argument.');
-      
-      document.getElementsByClassName('className');
-
+this.
-      prototypeUpdateHelper.logLevel = UpdateHelper.Info;
-}
+
-  });
-  

spinoffs/prototype/trunk/test/unit/ajax.html

@@ -82 +82 @@
-  
-  new Test.Unit.Runner({
-
+ 
-      $('content').update('');
-      $('content2').update('');
-    },
-    
-
+ 
-      // hack to cleanup responders
-      Ajax.Responders.responders = [Ajax.Responders.responders[0]];
-    },
-    
-with(this) {
-
-
-
+
+this.
+
+this.
-      new Ajax.Request("fixtures/hello.js", {
-        asynchronous: false,
@@ -101 +101 @@
-        evalJS: 'force'
-      });
-
+this.
-      
-      var h2 = $("content").firstChild;
-
-}
-
-with(this) {
-
+this.
+
+
+
+this.
-      
-      new Ajax.Request("fixtures/hello.js", {
@@ -115 +115 @@
-        evalJS: 'force'
-      });
-
+this.
-        var h2 = $("content").firstChild;
-
-
-}
-
-with(this) {
-
+this.
+
+
+
+
+this.
-      
-      new Ajax.Updater("content", "fixtures/content.html", { method:'get' });
-      
-
-
+this.
+this.
-        
-        $('content').update('');
-
+this.
-         
-        new Ajax.Updater({ success:"content", failure:"content2" },
@@ -137 +137 @@
-        new Ajax.Updater("", "fixtures/content.html", { method:'get', parameters:"pet=monkey" });
-        
-
-
-
+this.
+this.
+this.
-        });
-      }); 
-}
-
-with(this) {
+
+
+
-      $('content').update();
-      new Ajax.Updater("content", "fixtures/content.html", { method:'get', insertion: Insertion.Top });
-
-
+this.
+this.
-        $('content').update();
-        new Ajax.Updater("content", "fixtures/content.html", { method:'get', insertion: 'bottom' });      
-
-
+this.
+this.
-          
-          $('content').update();
-          new Ajax.Updater("content", "fixtures/content.html", { method:'get', insertion: 'after' });      
-
-
+this.
+this.
-          });
-        });
-      });
-}
-
-with(this) {
+
+
+
-      var options = {
-        method: 'get',
@@ -172 +172 @@
-      var request = new Ajax.Updater("content", "fixtures/hello.js", options);
-      request.options.onComplete = function() {};
-
-}
-
-with(this) {
+this.
+
+
+
-      // check for internal responder
-
+this.
-      
-      var dummyResponder = {
@@ -184 +184 @@
-      
-      Ajax.Responders.register(dummyResponder);
-
+this.
-      
-      // don't add twice
-      Ajax.Responders.register(dummyResponder);
-
+this.
-      
-      Ajax.Responders.unregister(dummyResponder);
-
+this.
-      
-      var responder = {
@@ -200 +200 @@
-      Ajax.Responders.register(responder);
-      
-
-
+this.
+this.
-      new Ajax.Request("fixtures/content.html", { method:'get', parameters:"pet=monkey" });
-
-
-
-
-
-
-
-}
-
-with(this) {
-
-
-
-
+this.
+this.
+
+this.
+this.
+this.
+
+
+
+
+this.
+this.
+
+this.
-        new Ajax.Request("fixtures/hello.js", extendDefault({
-assertNotEqual("", $("content").innerHTML) }
-
-
+this.assertNotEqual("", $("content").innerHTML) }.bind(this)
+
+this.
-      
-        var h2 = $("content").firstChild;
-
-
-
-
-}
-
-with(this) {
-
+this.
+
+this.
+
+
+
+
+this.
-        new Ajax.Request('/inspect', extendDefault({
-          method: 'put',
-          contentType: 'application/bogus',
-          onComplete: function(response) {
-
-
-
-
-
-
-}
-
-with(this) {
+this.
+.bind(this)
+
+
+this.
+
+
+
+
-      new Ajax.Request("fixtures/content.html", extendDefault({
-assertEqual(0, transport.readyState) }
-assertNotEqual(0, transport.readyState) }
+this.assertEqual(0, transport.readyState) }.bind(this)
+this.assertNotEqual(0, transport.readyState) }.bind(this)
-      }));
-}
-
-with(this) {
-
+
+
+
+this.
-        
-        $('content').update();
@@ -258 +258 @@
-          onComplete: function(transport) { 
-            var h2 = $("content").firstChild;
-
-
+this.
+.bind(this)
-        }));
-        
@@ -267 +267 @@
-          parameters: Fixtures.js,
-          onComplete: function(transport) { 
-
-
-
-
-
+this.
+.bind(this)
+
+
+this.
-      }
-      
@@ -279 +279 @@
-        onComplete: function(transport) { 
-          var h2 = $("content").firstChild;
-
-
+this.
+.bind(this)
-      }));
-}
-
-with(this) {
+
+
+
-      var options = extendDefault({
-assertInstanceOf(Ajax.Response, transport) }
+this.assertInstanceOf(Ajax.Response, transport) }.bind(this)
-      });
-      
@@ -294 +294 @@
-
-      new Ajax.Request("fixtures/content.html", options);
-}
-
-with(this) {
+
+
+
-      new Ajax.Request("fixtures/empty.html", extendDefault({
-assertEqual('', transport.responseText) }
+this.assertEqual('', transport.responseText) }.bind(this)
-      }));
-      
-      new Ajax.Request("fixtures/content.html", extendDefault({
-assertEqual(sentence, transport.responseText.toLowerCase()) }
+this.assertEqual(sentence, transport.responseText.toLowerCase()) }.bind(this)
-      }));
-}
-
-with(this) {
-
+
+
+
+this.
-        new Ajax.Request("/response", extendDefault({
-          parameters: Fixtures.xml,
-          onComplete: function(transport) { 
-
-
-
-
-
-
-}
-
-with(this) {
-
+this.
+.bind(this)
+
+
+this.
+
+
+
+
+this.
-        new Ajax.Request("/response", extendDefault({
-          parameters: Fixtures.json,
-assertEqual(123, transport.responseJSON.test) }
+this.assertEqual(123, transport.responseJSON.test) }.bind(this)
-        }));
-        
@@ -331 +331 @@
-            'Content-Type': 'application/json'
-          },
-assertNull(transport.responseJSON) }
+this.assertNull(transport.responseJSON) }.bind(this)
-        }));
-        
@@ -337 +337 @@
-          evalJSON: false,
-          parameters: Fixtures.json,
-assertNull(transport.responseJSON) }
+this.assertNull(transport.responseJSON) }.bind(this)
-        }));
-      
-        new Ajax.Request("/response", extendDefault({
-          parameters: Fixtures.jsonWithoutContentType,
-assertNull(transport.responseJSON) }
+this.assertNull(transport.responseJSON) }.bind(this)
-        }));
-      
@@ -349 +349 @@
-          parameters: Fixtures.invalidJson,
-          onException: function(request, error) {
-
-
-
-
-
-
+this.
+this.
+.bind(this)
+
+
+this.
-      }
-      
-      new Ajax.Request("fixtures/data.json", extendDefault({
-        evalJSON: 'force',
-assertEqual(123, transport.responseJSON.test) }
+this.assertEqual(123, transport.responseJSON.test) }.bind(this)
-      }));
-}
-
-with(this) {
-
+
+
+
+this.
-        new Ajax.Request("/response", extendDefault({
-          parameters: Fixtures.headerJson,
-          onComplete: function(transport, json) {
-
-
-
+this.
+this.
+.bind(this)
-        }));
-      
-        new Ajax.Request("/response", extendDefault({
-          onComplete: function(transport, json) { 
-
-
-
-
-
-
-
-}
-
-with(this) {
-
+this.
+this.
+.bind(this)
+
+
+this.
+
+
+
+
+this.
-       new Ajax.Request("/response", extendDefault({
-          parameters: { 'X-TEST': 'some value' },
-          onComplete: function(transport) {
-
-
-
-
-
-
-
-}
-
-with(this) {
-
+this.
+this.
+.bind(this)
+
+
+this.
+
+
+
+
+this.
-        new Ajax.Request("/response", extendDefault({
-          parameters: $H({ "one": "two", "three": "four" }),
-          onComplete: function(transport) {
-
-
-
-
-
-
-
-
-}
-
-with(this) {
+this.
+this.
+this.
+.bind(this)
+
+
+this.
+
+
+
+
-      var isSameOrigin = Ajax.Request.prototype.isSameOrigin;
-
-
-
-
-
+this.
+this.
+this.
+
+this.
-        Ajax.Request.prototype.isSameOrigin = function() {
-          return false
@@ -428 +428 @@
-          parameters: Fixtures.js,
-          onComplete: function(transport) { 
-
-
+this.
+.bind(this)
-        }));
-
@@ -435 +435 @@
-          parameters: Fixtures.invalidJson,
-          onException: function(request, error) {
-
-
+this.
+.bind(this)
-        }));
-
@@ -442 +442 @@
-          parameters: { 'X-JSON': '{});window.attacked = true;({}' },
-          onException: function(request, error) {
-
-
+this.
+.bind(this)
-        }));
-
-        Ajax.Request.prototype.isSameOrigin = isSameOrigin;
-      } else {
-
-
-}
+this.
+
+
-  });
-// ]]>

spinoffs/prototype/trunk/test/unit/array.html

@@ -33 +33 @@
-
-  new Test.Unit.Runner({
- with(this) {
-
-}
-
- with(this) {
+
+this.
+
+
+
-      function toArrayOnArguments(){
-        globalArgsTest = $A(arguments);
-      }
-      toArrayOnArguments();
-
+this.
-      toArrayOnArguments('foo');
-
+this.
-      toArrayOnArguments('foo','bar');
-
-}
-
- with(this) {
+this.