0
@@ -1,3 +1,5 @@
0
+* Remove usage of the `with` statement from unit tests. [Tobie Langel]
0
+
0
 * Complete rewrite of the deprecation helper, now renamed UpdateHelper and useable by third-party libs. [Tobie Langel]
0
 
0
 * Make Element#writeAttribute handle frameborder attribute in IE. Closes #11068. [staaky, Tobie Langel]

0
@@ -76,212 +76,212 @@
0
   });
0
   
0
   new Test.Unit.Runner({
0
-    testGetStack: function(){ with(this) {
0
-      assertMatch(/prototype_update_helper\.html:\d+\n$/, prototypeUpdateHelper.getStack());
0
-    }},
0
+    testGetStack: function() {
0
+      this.assertMatch(/prototype_update_helper\.html:\d+\n$/, prototypeUpdateHelper.getStack());
0
+    },
0
 
0
-    testDisplay: function(){ with(this) {
0
+    testDisplay: function()) {
0
       Toggle.display('foo');
0
-      assertInfoNotified('Toggle.display has been deprecated, please use Element.toggle instead.');
0
+      this.assertInfoNotified('Toggle.display has been deprecated, please use Element.toggle instead.');
0
         
0
       Element.show('foo', 'bar', 'bla');
0
-      assertErrorNotified('Passing an arbitrary number of elements to Element.show is no longer supported.\n' +
0
+      this.assertErrorNotified('Passing an arbitrary number of elements to Element.show is no longer supported.\n' +
0
         'Use [id_1, id_2, ...].each(Element.show) or $(id_1, id_2, ...).invoke("show") instead.');
0
       
0
       $('foo', 'bar', 'bla').each(Element.hide);
0
-      assertNotNotified();
0
+      this.assertNotNotified();
0
       
0
       Element.show('foo');
0
-      assertNotNotified();
0
+      this.assertNotNotified();
0
       
0
       Element.hide('foo', 'bar', 'bla');
0
-      assertErrorNotified('Passing an arbitrary number of elements to Element.hide is no longer supported.\n' +
0
+      this.assertErrorNotified('Passing an arbitrary number of elements to Element.hide is no longer supported.\n' +
0
         'Use [id_1, id_2, ...].each(Element.hide) or $(id_1, id_2, ...).invoke("hide") instead.');
0
       
0
       Element.toggle('foo', 'bar', 'bla');
0
-      assertErrorNotified('Passing an arbitrary number of elements to Element.toggle is no longer supported.\n' +
0
+      this.assertErrorNotified('Passing an arbitrary number of elements to Element.toggle is no longer supported.\n' +
0
         'Use [id_1, id_2, ...].each(Element.toggle) or $(id_1, id_2, ...).invoke("toggle") instead.');
0
-    }},
0
+    }},
0
     
0
-    testElementStyle: function(){ with(this) {
0
+    testElementStyle: function()) {
0
       Element.setStyle('foo', { 'fontSize': '18px' });
0
-      assertNotNotified();
0
+      this.assertNotNotified();
0
       
0
       Element.setStyle('foo', { 'font-size': '18px' });
0
-      assertErrorNotified('Use of uncamelized style-property names is no longer supported.\n' + 
0
+      this.assertErrorNotified('Use of uncamelized style-property names is no longer supported.\n' + 
0
         'Use either camelized style-property names or a regular CSS string instead (see online documentation).')
0
       
0
       Element.setStyle('foo', 'font-size: 18px;');
0
-      assertNotNotified();
0
+      this.assertNotNotified();
0
       
0
       $('foo').setStyle({ 'font-size': '18px' });
0
-      assertErrorNotified('Use of uncamelized style-property names is no longer supported.\n' + 
0
+      this.assertErrorNotified('Use of uncamelized style-property names is no longer supported.\n' + 
0
         'Use either camelized style-property names or a regular CSS string instead (see online documentation).')
0
-    }},
0
+    }},
0
 
0
-    testClassNames: function(){ with(this) {
0
+    testClassNames: function()) {
0
       new Element.ClassNames('foo');
0
-      assertInfoNotified('Element.ClassNames has been deprecated.')
0
+      this.assertInfoNotified('Element.ClassNames has been deprecated.')
0
       
0
       $('foo').classNames();
0
-      assertInfoNotified('Element#classNames has been deprecated.\n' +
0
+      this.assertInfoNotified('Element#classNames has been deprecated.\n' +
0
         'If you need to access CSS class names as an array, try: $w(element.classname).')
0
 
0
       Element.getElementsByClassName('foo', 'className');
0
-      assertInfoNotified('Element#getElementsByClassName has been deprecated, please use Element#select instead.')
0
+      this.assertInfoNotified('Element#getElementsByClassName has been deprecated, please use Element#select instead.')
0
       
0
       document.getElementsByClassName('className');
0
-      assertInfoNotified('document.getElementsByClassName has been deprecated, please use $$ instead.')
0
-    }},
0
+      this.assertInfoNotified('document.getElementsByClassName has been deprecated, please use $$ instead.')
0
+    },
0
     
0
-    testDomSelectors: function(){ with(this) {
0
+    testDomSelectors: function()) {
0
       Element.childOf('foo', 'bar');
0
-      assertInfoNotified('Element#childOf has been deprecated, please use Element#descendantOf instead.');
0
+      this.assertInfoNotified('Element#childOf has been deprecated, please use Element#descendantOf instead.');
0
 
0
       $('foo').immediateDescendants();
0
-      assertInfoNotified('Element#immediateDescendants has been deprecated, please use Element#childElements instead.');
0
+      this.assertInfoNotified('Element#immediateDescendants has been deprecated, please use Element#childElements instead.');
0
       
0
       $('foo').getElementsBySelector('a');
0
-      assertInfoNotified('Element#getElementsBySelector has been deprecated, please use Element#select instead.');
0
+      this.assertInfoNotified('Element#getElementsBySelector has been deprecated, please use Element#select instead.');
0
 
0
       $('foo').select('a');
0
-      assertNotNotified();
0
-    }},
0
+      this.assertNotNotified();
0
+    },
0
     
0
-    testField: function(){ with(this) {
0
+    testField: function()) {
0
       Field.clear('foo', 'bar', 'bla');
0
-      assertErrorNotified('Passing an arbitrary number of elements to Field.clear is no longer supported.\n' +
0
+      this.assertErrorNotified('Passing an arbitrary number of elements to Field.clear is no longer supported.\n' +
0
         'Use [id_1, id_2, ...].each(Form.Element.clear) or $(id_1, id_2, ...).invoke("clear") instead.');
0
         
0
       Field.present('foo', 'bar', 'bla');
0
-      assertErrorNotified('Passing an arbitrary number of elements to Field.present is no longer supported.\n' +
0
+      this.assertErrorNotified('Passing an arbitrary number of elements to Field.present is no longer supported.\n' +
0
         'Use [id_1, id_2, ...].each(Form.Element.present) or $(id_1, id_2, ...).invoke("present") instead.');
0
-    }},
0
+    }},
0
     
0
-    testInsertion: function(){ with(this) {
0
+    testInsertion: function()) {
0
       Insertion.Before('foo', 'text');
0
-      assertInfoNotified('Insertion.Before has been deprecated, please use Element#insert instead.');
0
+      this.assertInfoNotified('Insertion.Before has been deprecated, please use Element#insert instead.');
0
 
0
       Insertion.Top('foo', 'text');
0
-      assertInfoNotified('Insertion.Top has been deprecated, please use Element#insert instead.');
0
+      this.assertInfoNotified('Insertion.Top has been deprecated, please use Element#insert instead.');
0
 
0
       Insertion.Bottom('foo', 'text');
0
-      assertInfoNotified('Insertion.Bottom has been deprecated, please use Element#insert instead.');
0
+      this.assertInfoNotified('Insertion.Bottom has been deprecated, please use Element#insert instead.');
0
 
0
       Insertion.After('foo', 'text');
0
-      assertInfoNotified('Insertion.After has been deprecated, please use Element#insert instead.');
0
-    }},
0
+      this.assertInfoNotified('Insertion.After has been deprecated, please use Element#insert instead.');
0
+    },
0
     
0
-    testPosition: function(){ with(this) {
0
+    testPosition: function()) {
0
       Position.prepare('foo');
0
-      assertInfoNotified('Position.prepare has been deprecated.');
0
+      this.assertInfoNotified('Position.prepare has been deprecated.');
0
 
0
       Position.within('foo');
0
-      assertInfoNotified('Position.within has been deprecated.');
0
+      this.assertInfoNotified('Position.within has been deprecated.');
0
 
0
       Position.withinIncludingScrolloffsets('foo');
0
-      assertInfoNotified('Position.withinIncludingScrolloffsets has been deprecated.');
0
+      this.assertInfoNotified('Position.withinIncludingScrolloffsets has been deprecated.');
0
 
0
       Position.overlap('foo');
0
-      assertInfoNotified('Position.overlap has been deprecated.');
0
+      this.assertInfoNotified('Position.overlap has been deprecated.');
0
 
0
       Position.cumulativeOffset('foo');
0
-      assertInfoNotified('Position.cumulativeOffset has been deprecated, please use Element#cumulativeOffset instead.');
0
+      this.assertInfoNotified('Position.cumulativeOffset has been deprecated, please use Element#cumulativeOffset instead.');
0
 
0
       Position.positionedOffset('foo');
0
-      assertInfoNotified('Position.positionedOffset has been deprecated, please use Element#positionedOffset instead.');
0
+      this.assertInfoNotified('Position.positionedOffset has been deprecated, please use Element#positionedOffset instead.');
0
 
0
       Position.absolutize('foo');
0
-      assertInfoNotified('Position.absolutize has been deprecated, please use Element#absolutize instead.');
0
+      this.assertInfoNotified('Position.absolutize has been deprecated, please use Element#absolutize instead.');
0
 
0
       Position.relativize('foo');
0
-      assertInfoNotified('Position.relativize has been deprecated, please use Element#relativize instead.');
0
+      this.assertInfoNotified('Position.relativize has been deprecated, please use Element#relativize instead.');
0
 
0
       Position.realOffset('foo');
0
-      assertInfoNotified('Position.realOffset has been deprecated, please use Element#cumulativeScrollOffset instead.');
0
+      this.assertInfoNotified('Position.realOffset has been deprecated, please use Element#cumulativeScrollOffset instead.');
0
 
0
       Position.offsetParent('foo');
0
-      assertInfoNotified('Position.offsetParent has been deprecated, please use Element#getOffsetParent instead.');
0
+      this.assertInfoNotified('Position.offsetParent has been deprecated, please use Element#getOffsetParent instead.');
0
 
0
       Position.page('foo');
0
-      assertInfoNotified('Position.page has been deprecated, please use Element#viewportOffset instead.');
0
+      this.assertInfoNotified('Position.page has been deprecated, please use Element#viewportOffset instead.');
0
 
0
       Position.clone('foo', 'bar');
0
-      assertInfoNotified('Position.clone has been deprecated, please use Element#clonePosition instead.');
0
-    }},
0
+      this.assertInfoNotified('Position.clone has been deprecated, please use Element#clonePosition instead.');
0
+    },
0
 
0
-    testEvent: function(){ with(this) {
0
+    testEvent: function()) {
0
       Event.unloadCache();
0
-      assertErrorNotified('Event.unloadCache has been deprecated.')
0
-    }},
0
+      this.assertErrorNotified('Event.unloadCache has been deprecated.')
0
+    },
0
     
0
-    testHash: function(){ with(this) {
0
+    testHash: function()) {
0
       Hash.toQueryString({});
0
-      assertInfoNotified('Hash.toQueryString has been deprecated.\n' + 
0
+      this.assertInfoNotified('Hash.toQueryString has been deprecated.\n' + 
0
         'Use the instance method Hash#toQueryString or Object.toQueryString instead.');
0
 
0
      Hash.toJSON({});
0
-      assertErrorNotified('Hash.toJSON has been removed.\n' + 
0
+      this.assertErrorNotified('Hash.toJSON has been removed.\n' + 
0
         'Use the instance method Hash#toJSON or Object.toJSON instead.');
0
       
0
       var h = $H({ foo: 2 });
0
       
0
       h.remove('foo');
0
-      assertErrorNotified('Hash#remove is no longer supported, use Hash#unset instead.\n' + 
0
+      this.assertErrorNotified('Hash#remove is no longer supported, use Hash#unset instead.\n' + 
0
         'Please note that Hash#unset only accepts one argument.');
0
       
0
       h.merge('foo');
0
-        assertWarnNotified('Hash#merge is no longer destructive and now operates on a clone of the Hash instance.\n' + 'If you need a destructive merge, use Hash#update instead.');
0
+        this.assertWarnNotified('Hash#merge is no longer destructive and now operates on a clone of the Hash instance.\n' + 'If you need a destructive merge, use Hash#update instead.');
0
       
0
       h['foo'];
0
-      assertErrorNotified('Directly accessing a property of an instance of Hash is no longer supported.\n' + 
0
+      this.assertErrorNotified('Directly accessing a property of an instance of Hash is no longer supported.\n' + 
0
         'Please use Hash#get(\'foo\') instead.')
0
       
0
       h.foo = 3;
0
-      assertErrorNotified('Directly setting a property on an instance of Hash is no longer supported.\n' + 
0
+      this.assertErrorNotified('Directly setting a property on an instance of Hash is no longer supported.\n' + 
0
         'Please use Hash#set(\'foo\', 3) instead.')
0
         
0
       h.bar = 'bar';
0
       h.toJSON();
0
-      assertErrorNotified('Directly setting a property on an instance of Hash is no longer supported.\n' + 
0
+      this.assertErrorNotified('Directly setting a property on an instance of Hash is no longer supported.\n' + 
0
         'Please use Hash#set(\'bar\', \'bar\') instead.')
0
         
0
       h.bar;
0
-      assertErrorNotified('Directly accessing a property of an instance of Hash is no longer supported.\n' + 
0
+      this.assertErrorNotified('Directly accessing a property of an instance of Hash is no longer supported.\n' + 
0
         'Please use Hash#get(\'bar\') instead.')
0
         
0
       h.baz = 'baz';
0
       h.bar;
0
-      assertErrorNotified('Directly setting a property on an instance of Hash is no longer supported.\n' + 
0
+      this.assertErrorNotified('Directly setting a property on an instance of Hash is no longer supported.\n' + 
0
         'Please use Hash#set(\'baz\', \'baz\') instead.')
0
       
0
       h.set('toJSON', 'arg'); // make sure hash methods are not overwritten
0
-      assertRespondsTo('toJSON', h)
0
-    }},
0
+      this.assertRespondsTo('toJSON', h)
0
+    },
0
 
0
-    testClass: function(){ with(this) {
0
+    testClass: function()) {
0
       Class.create();
0
-      assertInfoNotified('The class API has been fully revised and now allows for mixins and inheritance.\n' + 
0
+      this.assertInfoNotified('The class API has been fully revised and now allows for mixins and inheritance.\n' + 
0
         'You can find more about it here: http://prototypejs.org/learn/class-inheritance');
0
       Class.create({});
0
-      assertNotNotified();
0
-    }},
0
+      this.assertNotNotified();
0
+    },
0
     
0
-    testLogDeprecationOption: function(){ with(this) {
0
+    testLogDeprecationOption: function()) {
0
       prototypeUpdateHelper.logLevel = UpdateHelper.Warn;
0
       var h = $H({ foo: 2 });
0
       
0
       h.merge({ foo: 3 });
0
-      assertWarnNotified('Hash#merge is no longer destructive and now operates on a clone of the Hash instance.\n' + 'If you need a destructive merge, use Hash#update instead.');
0
+      this.assertWarnNotified('Hash#merge is no longer destructive and now operates on a clone of the Hash instance.\n' + 'If you need a destructive merge, use Hash#update instead.');
0
       
0
       h.remove('foo');
0
-      assertErrorNotified('Hash#remove is no longer supported, use Hash#unset instead.\n' + 
0
+      this.assertErrorNotified('Hash#remove is no longer supported, use Hash#unset instead.\n' + 
0
         'Please note that Hash#unset only accepts one argument.');
0
       
0
       document.getElementsByClassName('className');
0
-      assertNotNotified();
0
+      this.assertNotNotified();
0
       prototypeUpdateHelper.logLevel = UpdateHelper.Info;
0
-    }}
0
+    }}
0
   });
0
   
0
 </script>

0
@@ -81,88 +81,88 @@
0
   var message = 'You must be running your tests from rake to test this feature.';
0
   
0
   new Test.Unit.Runner({
0
-    setup: function(){
0
+    setup: function() {
0
       $('content').update('');
0
       $('content2').update('');
0
     },
0
     
0
-    teardown: function(){
0
+    teardown: function() {
0
       // hack to cleanup responders
0
       Ajax.Responders.responders = [Ajax.Responders.responders[0]];
0
     },
0
     
0
-    testSynchronousRequest: function() {with(this) {
0
-      assertEqual("", $("content").innerHTML);
0
+    testSynchronousRequest: function() {
0
+      this.assertEqual("", $("content").innerHTML);
0
       
0
-      assertEqual(0, Ajax.activeRequestCount);
0
+      this.assertEqual(0, Ajax.activeRequestCount);
0
       new Ajax.Request("fixtures/hello.js", {
0
         asynchronous: false,
0
         method: 'GET',
0
         evalJS: 'force'
0
       });
0
-      assertEqual(0, Ajax.activeRequestCount);
0
+      this.assertEqual(0, Ajax.activeRequestCount);
0
       
0
       var h2 = $("content").firstChild;
0
-      assertEqual("Hello world!", h2.innerHTML);
0
-    }},
0
+      this.assertEqual("Hello world!", h2.innerHTML);
0
+    },
0
     
0
-    testAsynchronousRequest: function() {with(this) {
0
-      assertEqual("", $("content").innerHTML);
0
+    testAsynchronousRequest: function() {
0
+      this.assertEqual("", $("content").innerHTML);
0
       
0
       new Ajax.Request("fixtures/hello.js", {
0
         asynchronous: true,
0
         method: 'get',
0
         evalJS: 'force'
0
       });
0
-      wait(1000, function() {
0
+      this.wait(1000, function() {
0
         var h2 = $("content").firstChild;
0
-        assertEqual("Hello world!", h2.innerHTML);
0
+        this.assertEqual("Hello world!", h2.innerHTML);
0
       });
0
-    }},
0
+    }},
0
     
0
-    testUpdater: function() {with(this) {
0
-      assertEqual("", $("content").innerHTML);
0
+    testUpdater: function() {
0
+      this.assertEqual("", $("content").innerHTML);
0
       
0
       new Ajax.Updater("content", "fixtures/content.html", { method:'get' });
0
       
0
-      wait(1000, function() {
0
-        assertEqual(sentence, $("content").innerHTML.strip().toLowerCase());
0
+      this.wait(1000, function() {
0
+        this.assertEqual(sentence, $("content").innerHTML.strip().toLowerCase());
0
         
0
         $('content').update('');
0
-        assertEqual("", $("content").innerHTML);
0
+        this.assertEqual("", $("content").innerHTML);
0
          
0
         new Ajax.Updater({ success:"content", failure:"content2" },
0
           "fixtures/content.html", { method:'get', parameters:{ pet:'monkey' } });
0
         
0
         new Ajax.Updater("", "fixtures/content.html", { method:'get', parameters:"pet=monkey" });
0
         
0
-        wait(1000, function() {
0
-          assertEqual(sentence, $("content").innerHTML.strip().toLowerCase());
0
-          assertEqual("", $("content2").innerHTML);
0
+        this.wait(1000, function() {
0
+          this.assertEqual(sentence, $("content").innerHTML.strip().toLowerCase());
0
+          this.assertEqual("", $("content2").innerHTML);
0
         });
0
       }); 
0
-    }},
0
+    }},
0
     
0
-    testUpdaterWithInsertion: function() {with(this) {
0
+    testUpdaterWithInsertion: function() {) {
0
       $('content').update();
0
       new Ajax.Updater("content", "fixtures/content.html", { method:'get', insertion: Insertion.Top });
0
-      wait(1000, function() {
0
-        assertEqual(sentence, $("content").innerHTML.strip().toLowerCase());
0
+      this.wait(1000, function() {
0
+        this.assertEqual(sentence, $("content").innerHTML.strip().toLowerCase());
0
         $('content').update();
0
         new Ajax.Updater("content", "fixtures/content.html", { metho