Reduce reliance on fnGlobalObject.js

test/annexB/built-ins/escape/B.2.1.js

@@ -6,12 +6,10 @@ es5id: B.2.1
 description: >
     Object.getOwnPropertyDescriptor returns data desc for functions on
     built-ins (Global.escape)
-includes:
-    - fnGlobalObject.js
-    - propertyHelper.js
+includes: [propertyHelper.js]
 ---*/
 
-var global = fnGlobalObject();
+var global = this;
 
 verifyWritable(global, "escape");
 verifyNotEnumerable(global, "escape");

test/annexB/built-ins/unescape/B.2.2.js

@@ -6,13 +6,9 @@ es5id: B.2.2
 description: >
     Object.getOwnPropertyDescriptor returns data desc for functions on
     built-ins (Global.unescape)
-includes:
-    - fnGlobalObject.js
-    - propertyHelper.js
+includes: [propertyHelper.js]
 ---*/
 
-var global = fnGlobalObject();
-
-verifyWritable(global, "unescape");
-verifyNotEnumerable(global, "unescape");
-verifyConfigurable(global, "unescape");
+verifyWritable(this, "unescape");
+verifyNotEnumerable(this, "unescape");
+verifyConfigurable(this, "unescape");

test/built-ins/Array/isArray/15.4.3.2-1-15.js

@@ -4,7 +4,6 @@
 /*---
 es5id: 15.4.3.2-1-15
 description: Array.isArray applied to the global object
-includes: [fnGlobalObject.js]
 ---*/
 
-assert.sameValue(Array.isArray(fnGlobalObject()), false, 'Array.isArray(fnGlobalObject())');
+assert.sameValue(Array.isArray(this), false, 'Array.isArray(this)');

test/built-ins/Array/prototype/every/15.4.4.16-2-15.js

@@ -4,7 +4,6 @@
 /*---
 es5id: 15.4.4.16-2-15
 description: Array.prototype.every - 'length' is property of the global object
-includes: [fnGlobalObject.js]
 ---*/
 
         function callbackfn1(val, idx, obj) {
@@ -15,11 +14,11 @@ includes: [fnGlobalObject.js]
             return val > 11;
         }
 
-            var oldLen = fnGlobalObject().length;
-            fnGlobalObject()[0] = 12;
-            fnGlobalObject()[1] = 11;
-            fnGlobalObject()[2] = 9;
-            fnGlobalObject().length = 2;
+            var oldLen = this.length;
+            this[0] = 12;
+            this[1] = 11;
+            this[2] = 9;
+            this.length = 2;
 
-assert(Array.prototype.every.call(fnGlobalObject(), callbackfn1), 'Array.prototype.every.call(fnGlobalObject(), callbackfn1) !== true');
-assert.sameValue(Array.prototype.every.call(fnGlobalObject(), callbackfn2), false, 'Array.prototype.every.call(fnGlobalObject(), callbackfn2)');
+assert(Array.prototype.every.call(this, callbackfn1), 'Array.prototype.every.call(this, callbackfn1) !== true');
+assert.sameValue(Array.prototype.every.call(this, callbackfn2), false, 'Array.prototype.every.call(this, callbackfn2)');

test/built-ins/Array/prototype/every/15.4.4.16-5-1.js

@@ -5,12 +5,13 @@
 es5id: 15.4.4.16-5-1
 description: Array.prototype.every - thisArg not passed
 flags: [noStrict]
-includes: [fnGlobalObject.js]
 ---*/
 
+var global = this;
+
   function callbackfn(val, idx, obj)
   {
-    return this === fnGlobalObject();
+    return this === global;
   }
 
   var arr = [1];

test/built-ins/Array/prototype/every/15.4.4.16-5-21.js

@@ -4,15 +4,15 @@
 /*---
 es5id: 15.4.4.16-5-21
 description: Array.prototype.every - the global object can be used as thisArg
-includes: [fnGlobalObject.js]
 ---*/
 
+var global = this;
         var accessed = false;
 
         function callbackfn(val, idx, obj) {
             accessed = true;
-            return this === fnGlobalObject();
+            return this === global;
         }
 
-assert([11].every(callbackfn, fnGlobalObject()), '[11].every(callbackfn, fnGlobalObject()) !== true');
+assert([11].every(callbackfn, global), '[11].every(callbackfn, global) !== true');
 assert(accessed, 'accessed !== true');

test/built-ins/Array/prototype/every/15.4.4.16-7-c-i-23.js

@@ -6,7 +6,6 @@ es5id: 15.4.4.16-7-c-i-23
 description: >
     Array.prototype.every - This object is an global object which
     contains index property
-includes: [fnGlobalObject.js]
 ---*/
 
         function callbackfn(val, idx, obj) {
@@ -17,8 +16,8 @@ includes: [fnGlobalObject.js]
             }
         }
 
-            var oldLen = fnGlobalObject().length;
-            fnGlobalObject()[0] = 11;
-            fnGlobalObject().length = 1;
+            var oldLen = this.length;
+            this[0] = 11;
+            this.length = 1;
 
-assert.sameValue(Array.prototype.every.call(fnGlobalObject(), callbackfn), false, 'Array.prototype.every.call(fnGlobalObject(), callbackfn)');
+assert.sameValue(Array.prototype.every.call(this, callbackfn), false, 'Array.prototype.every.call(this, callbackfn)');

test/built-ins/Array/prototype/every/15.4.4.16-7-c-iii-27.js

@@ -6,14 +6,14 @@ es5id: 15.4.4.16-7-c-iii-27
 description: >
     Array.prototype.every - return value of callbackfn is the global
     object
-includes: [fnGlobalObject.js]
 ---*/
 
+var global = this;
         var accessed = false;
 
         function callbackfn(val, idx, obj) {
             accessed = true;
-            return fnGlobalObject();
+            return global;
         }
 
 assert([11].every(callbackfn), '[11].every(callbackfn) !== true');

test/built-ins/Array/prototype/filter/15.4.4.20-2-15.js

@@ -4,18 +4,17 @@
 /*---
 es5id: 15.4.4.20-2-15
 description: Array.prototype.filter - 'length' is property of the global object
-includes: [fnGlobalObject.js]
 ---*/
 
         function callbackfn(val, idx, obj) {
             return  obj.length === 2;
         }
 
-            var oldLen = fnGlobalObject().length;
-            fnGlobalObject()[0] = 12;
-            fnGlobalObject()[1] = 11;
-            fnGlobalObject()[2] = 9;
-            fnGlobalObject().length = 2;
-            var newArr = Array.prototype.filter.call(fnGlobalObject(), callbackfn);
+            var oldLen = this.length;
+            this[0] = 12;
+            this[1] = 11;
+            this[2] = 9;
+            this.length = 2;
+            var newArr = Array.prototype.filter.call(this, callbackfn);
 
 assert.sameValue(newArr.length, 2, 'newArr.length');

test/built-ins/Array/prototype/filter/15.4.4.20-5-21.js

@@ -4,17 +4,18 @@
 /*---
 es5id: 15.4.4.20-5-21
 description: Array.prototype.filter - the global object can be used as thisArg
-includes: [fnGlobalObject.js]
 ---*/
 
+var global = this;
+
         var accessed = false;
 
         function callbackfn(val, idx, obj) {
             accessed = true;
-            return this === fnGlobalObject();
+            return this === global;
         }
 
-        var newArr = [11].filter(callbackfn, fnGlobalObject());
+        var newArr = [11].filter(callbackfn, global);
 
 assert.sameValue(newArr[0], 11, 'newArr[0]');
 assert(accessed, 'accessed !== true');

test/built-ins/Array/prototype/filter/15.4.4.20-9-c-i-23.js

@@ -6,17 +6,16 @@ es5id: 15.4.4.20-9-c-i-23
 description: >
     Array.prototype.filter - This object is the global object which
     contains index property
-includes: [fnGlobalObject.js]
 ---*/
 
         function callbackfn(val, idx, obj) {
             return idx === 0 && val === 11;
         }
 
-            var oldLen = fnGlobalObject().length;
-            fnGlobalObject()[0] = 11;
-            fnGlobalObject().length = 1;
-            var newArr = Array.prototype.filter.call(fnGlobalObject(), callbackfn);
+            var oldLen = this.length;
+            this[0] = 11;
+            this.length = 1;
+            var newArr = Array.prototype.filter.call(this, callbackfn);
 
 assert.sameValue(newArr.length, 1, 'newArr.length');
 assert.sameValue(newArr[0], 11, 'newArr[0]');

test/built-ins/Array/prototype/filter/15.4.4.20-9-c-iii-28.js

@@ -6,11 +6,11 @@ es5id: 15.4.4.20-9-c-iii-28
 description: >
     Array.prototype.filter - return value of callbackfn is the global
     object
-includes: [fnGlobalObject.js]
 ---*/
 
+var global = this;
         function callbackfn(val, idx, obj) {
-            return fnGlobalObject();
+            return global;
         }
 
         var newArr = [11].filter(callbackfn);

test/built-ins/Array/prototype/forEach/15.4.4.18-2-15.js

@@ -4,19 +4,18 @@
 /*---
 es5id: 15.4.4.18-2-15
 description: Array.prototype.forEach - 'length' is property of the global object
-includes: [fnGlobalObject.js]
 ---*/
 
         var result = false;
         function callbackfn(val, idx, obj) {
             result = (obj.length === 2);
         }
 
-            var oldLen = fnGlobalObject().length;
-            fnGlobalObject()[0] = 12;
-            fnGlobalObject()[1] = 11;
-            fnGlobalObject()[2] = 9;
-            fnGlobalObject().length = 2;
-            Array.prototype.forEach.call(fnGlobalObject(), callbackfn);
+            var oldLen = this.length;
+            this[0] = 12;
+            this[1] = 11;
+            this[2] = 9;
+            this.length = 2;
+            Array.prototype.forEach.call(this, callbackfn);
 
 assert(result, 'result !== true');

test/built-ins/Array/prototype/forEach/15.4.4.18-5-21.js

@@ -4,14 +4,14 @@
 /*---
 es5id: 15.4.4.18-5-21
 description: Array.prototype.forEach - the global object can be used as thisArg
-includes: [fnGlobalObject.js]
 ---*/
 
+var global = this;
         var result = false;
         function callbackfn(val, idx, obj) {
-            result = (this === fnGlobalObject());
+            result = (this === global);
         }
 
-        [11].forEach(callbackfn, fnGlobalObject());
+        [11].forEach(callbackfn, this);
 
 assert(result, 'result !== true');

test/built-ins/Array/prototype/forEach/15.4.4.18-7-c-i-23.js

@@ -6,7 +6,6 @@ es5id: 15.4.4.18-7-c-i-23
 description: >
     Array.prototype.forEach - This object is an global object which
     contains index property
-includes: [fnGlobalObject.js]
 ---*/
 
         var testResult = false;
@@ -17,10 +16,10 @@ includes: [fnGlobalObject.js]
             }
         }
 
-            var oldLen = fnGlobalObject().length;
-            fnGlobalObject()[0] = 11;
-            fnGlobalObject().length = 1;
+            var oldLen = this.length;
+            this[0] = 11;
+            this.length = 1;
 
-            Array.prototype.forEach.call(fnGlobalObject(), callbackfn);
+            Array.prototype.forEach.call(this, callbackfn);
 
 assert(testResult, 'testResult !== true');

test/built-ins/Array/prototype/indexOf/15.4.4.14-1-17.js

@@ -4,11 +4,10 @@
 /*---
 es5id: 15.4.4.14-1-17
 description: Array.prototype.indexOf applied to the global object
-includes: [fnGlobalObject.js]
 ---*/
 
-            var oldLen = fnGlobalObject().length;
-            fnGlobalObject()[1] = true;
-            fnGlobalObject().length = 2;
+            var oldLen = this.length;
+            this[1] = true;
+            this.length = 2;
 
-assert.sameValue(Array.prototype.indexOf.call(fnGlobalObject(), true), 1, 'Array.prototype.indexOf.call(fnGlobalObject(), true)');
+assert.sameValue(Array.prototype.indexOf.call(this, true), 1, 'Array.prototype.indexOf.call(this, true)');

test/built-ins/Array/prototype/indexOf/15.4.4.14-2-15.js

@@ -4,19 +4,18 @@
 /*---
 es5id: 15.4.4.14-2-15
 description: Array.prototype.indexOf - 'length' is property of the global object
-includes: [fnGlobalObject.js]
 ---*/
 
         var targetObj = {};
 
-            var oldLen = fnGlobalObject().length;
-            fnGlobalObject().length = 2;
+            var oldLen = this.length;
+            this.length = 2;
 
-            fnGlobalObject()[1] = targetObj;
+            this[1] = targetObj;
 
-assert.sameValue(Array.prototype.indexOf.call(fnGlobalObject(), targetObj), 1, 'Array.prototype.indexOf.call(fnGlobalObject(), targetObj)');
+assert.sameValue(Array.prototype.indexOf.call(this, targetObj), 1, 'Array.prototype.indexOf.call(this, targetObj)');
 
-            fnGlobalObject()[1] = {};
-            fnGlobalObject()[2] = targetObj;
+            this[1] = {};
+            this[2] = targetObj;
 
-assert.sameValue(Array.prototype.indexOf.call(fnGlobalObject(), targetObj), -1, 'Array.prototype.indexOf.call(fnGlobalObject(), targetObj)');
+assert.sameValue(Array.prototype.indexOf.call(this, targetObj), -1, 'Array.prototype.indexOf.call(this, targetObj)');

test/built-ins/Array/prototype/indexOf/15.4.4.14-9-b-i-23.js

@@ -4,17 +4,16 @@
 /*---
 es5id: 15.4.4.14-9-b-i-23
 description: Array.prototype.indexOf - This object is the global object
-includes: [fnGlobalObject.js]
 ---*/
 
         var targetObj = {};
 
-            var oldLen = fnGlobalObject().length;
-            fnGlobalObject()[0] = targetObj;
-            fnGlobalObject()[100] = "100";
-            fnGlobalObject()[200] = "200";
-            fnGlobalObject().length = 200;
+            var oldLen = this.length;
+            this[0] = targetObj;
+            this[100] = "100";
+            this[200] = "200";
+            this.length = 200;
 
-assert.sameValue(Array.prototype.indexOf.call(fnGlobalObject(), targetObj), 0, 'Array.prototype.indexOf.call(fnGlobalObject(), targetObj)');
-assert.sameValue(Array.prototype.indexOf.call(fnGlobalObject(), "100"), 100, 'Array.prototype.indexOf.call(fnGlobalObject(), "100")');
-assert.sameValue(Array.prototype.indexOf.call(fnGlobalObject(), "200"), -1, 'Array.prototype.indexOf.call(fnGlobalObject(), "200")');
+assert.sameValue(Array.prototype.indexOf.call(this, targetObj), 0, 'Array.prototype.indexOf.call(this, targetObj)');
+assert.sameValue(Array.prototype.indexOf.call(this, "100"), 100, 'Array.prototype.indexOf.call(this, "100")');
+assert.sameValue(Array.prototype.indexOf.call(this, "200"), -1, 'Array.prototype.indexOf.call(this, "200")');

test/built-ins/Array/prototype/lastIndexOf/15.4.4.15-1-17.js

@@ -4,13 +4,12 @@
 /*---
 es5id: 15.4.4.15-1-17
 description: Array.prototype.lastIndexOf applied to the global object
-includes: [fnGlobalObject.js]
 ---*/
 
         var targetObj = ["global"];
 
-            var oldLen = fnGlobalObject().length;
-            fnGlobalObject()[1] = targetObj;
-            fnGlobalObject().length = 3;
+            var oldLen = this.length;
+            this[1] = targetObj;
+            this.length = 3;
 
-assert.sameValue(Array.prototype.lastIndexOf.call(fnGlobalObject(), targetObj), 1, 'Array.prototype.lastIndexOf.call(fnGlobalObject(), targetObj)');
+assert.sameValue(Array.prototype.lastIndexOf.call(this, targetObj), 1, 'Array.prototype.lastIndexOf.call(this, targetObj)');