Final tests

src/decorator/accessor-deco-invalid-return-get.case

@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-initializefieldoraccessor
+esid: sec-applydecoratorstoelementdefinition
 desc: Accessor decorator cannot return invalid getter
 template: accessors/error/**/*
 features: [decorators]

src/decorator/accessor-deco-invalid-return-init.case

@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-initializefieldoraccessor
+esid: sec-applydecoratorstoelementdefinition
 desc: Accessor decorator cannot return invalid init
 template: accessors/error/**/*
 features: [decorators]

src/decorator/accessor-deco-invalid-return-set.case

@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-initializefieldoraccessor
+esid: sec-applydecoratorstoelementdefinition
 desc: Accessor decorator cannot return invalid setter
 template: accessors/error/**/*
 features: [decorators]

src/decorator/accessor-deco-invalid-return.case

@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-initializefieldoraccessor
+esid: sec-applydecoratorstoelementdefinition
 desc: Accessor decorator cannot return invalid init
 template: accessors/error/**/*
 features: [decorators]

src/decorator/accessor-deco-returns-get.case

@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-initializefieldoraccessor
+esid: sec-applydecoratorstoelementdefinition
 desc: Accessor decorator can return a new getter
 template: accessors/standard/**/*
 features: [decorators]

src/decorator/accessor-deco-returns-init.case

@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-initializefieldoraccessor
+esid: sec-applydecoratorstoelementdefinition
 desc: Accessor decorator can return a new init
 template: accessors/standard/**/*
 features: [decorators]

src/decorator/accessor-deco-returns-set.case

@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-initializefieldoraccessor
+esid: sec-applydecoratorstoelementdefinition
 desc: Accessor decorator can return a new getter
 template: accessors/standard/**/*
 features: [decorators]

src/decorator/accessor-with-init-deco-returns-get.case

@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-initializefieldoraccessor
+esid: sec-applydecoratorstoelementdefinition
 desc: Accessor decorator can return a new getter
 template: accessors/with-init/**/*
 features: [decorators]

src/decorator/accessor-with-init-deco-returns-init.case

@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-initializefieldoraccessor
+esid: sec-applydecoratorstoelementdefinition
 desc: Accessor decorator can return a new init that chains with default initializer
 template: accessors/with-init/**/*
 features: [decorators]

src/decorator/accessor-with-init-deco-returns-set.case

@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-initializefieldoraccessor
+esid: sec-applydecoratorstoelementdefinition
 desc: Accessor decorator can return a new setter when initializer is present
 template: accessors/with-init/**/*
 features: [decorators]

src/decorator/class-deco-invalid-return-arrow.case

@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-initializefieldoraccessor
+esid: sec-applydecoratorstoclassdefinition
 desc: Class decorator cannot return non-newable function (arrow)
 template: class/error
 features: [decorators]

src/decorator/class-deco-invalid-return-primitive.case

@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-initializefieldoraccessor
+esid: sec-applydecoratorstoclassdefinition
 desc: Class decorator cannot return a random non-newable value
 template: class/error
 features: [decorators]

src/decorator/class-deco-rebinds-identifier.case

@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-createdecoratorcontextobject
+esid: sec-applydecoratorstoclassdefinition
 desc: Class decorator return value is rebound before static fields are run
 template: class/standard/cls-decl.template
 features: [decorators]

src/decorator/class-deco-returns-class.case

@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-createdecoratorcontextobject
+esid: sec-applydecoratorstoclassdefinition
 desc: Class decorator can return a new class
 template: class/standard
 features: [decorators]

src/decorator/class-deco-returns-function.case

@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-createdecoratorcontextobject
+esid: sec-applydecoratorstoclassdefinition
 desc: Class decorator can return a standard function
 template: class/standard
 features: [decorators]

src/decorator/class-deco-returns-proxy.case

@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-createdecoratorcontextobject
+esid: sec-applydecoratorstoclassdefinition
 desc: Class decorator can return a Proxy
 template: class/standard
 features: [decorators, Proxy]

src/decorator/class-deco-returns-subclass.case

@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-createdecoratorcontextobject
+esid: sec-applydecoratorstoclassdefinition
 desc: Class decorator can return a new class
 template: class/standard
 features: [decorators]

src/decorator/class/error/cls-decl.template

@@ -5,7 +5,7 @@
 path: language/statements/class/decorator/class/error/
 name: class decorator evaluation error in class declaration
 features: [class, decorators]
-esid: prod-MethodDefinition
+esid: prod-ClassDeclaration
 ---*/
 
 /*{ decorators }*/

src/decorator/class/error/cls-expr.template

@@ -5,7 +5,7 @@
 path: language/expressions/class/decorator/class/error/
 name: private method decorator evaluation error in class expression
 features: [class, decorators, class-methods-private]
-esid: prod-MethodDefinition
+esid: prod-ClassExpression
 ---*/
 
 /*{ decorators }*/

src/decorator/class/standard/cls-decl.template

@@ -5,7 +5,7 @@
 path: language/statements/class/decorator/class/
 name: decorator usage in a class declaration
 features: [class]
-esid: prod-FieldDefinition
+esid: prod-ClassDeclaration
 ---*/
 
 /*{ decorators }*/

src/decorator/class/standard/cls-expr.template

@@ -5,7 +5,7 @@
 path: language/expressions/class/decorator/class/
 name: decorator usage in a class expression
 features: [class]
-esid: prod-FieldDefinition
+esid: prod-FieldExpression
 ---*/
 
 /*{ decorators }*/

src/decorator/class/with-super-class/cls-decl.template

@@ -5,7 +5,7 @@
 path: language/statements/class/decorator/class/with-super-class/
 name: decorator usage in a class declaration
 features: [class]
-esid: prod-FieldDefinition
+esid: prod-ClassDeclaration
 ---*/
 
 /*{ decorators }*/

src/decorator/class/with-super-class/cls-expr.template

@@ -5,7 +5,7 @@
 path: language/expressions/class/decorator/class/with-super-class/
 name: decorator usage in a class expression
 features: [class]
-esid: prod-FieldDefinition
+esid: prod-ClassExpression
 ---*/
 
 /*{ decorators }*/

src/decorator/decorator-order-application-field-and-accessor.case

@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-runtime-semantics-classdefinitionevaluation
+esid: sec-ecmascript-function-objects-construct-argumentslist-newtarget
 desc: Order of decorator application for elements with initializers
 templates:
   - accessors/with-init/**/*

src/decorator/decorator-order-phases-4-init-instance.case

@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-runtime-semantics-classdefinitionevaluation
+esid: sec-ecmascript-function-objects-construct-argumentslist-newtarget
 desc: Class instance creation order
 info: |
   Class instances are created in the following order:

src/decorator/field-init-this.case → src/decorator/field-and-accessor-init-this.case

@@ -4,17 +4,23 @@
 /*---
 esid: sec-initializefieldoraccessor
 desc: Field initializer `this` value is the instance or the class
-template: fields/with-init/**/*
+templates:
+  - fields/standard/**/*
+  - fields/with-init/**/*
+  - accessors/standard/**/*
+  - accessors/with-init/**/*
 features: [decorators]
 ---*/
 
 //- decorators
 var savedThisValues = [];
 
-function dec(value) {
-  return function(value) {
+function dec(value, context) {
+  function init (value) {
     savedThisValues.push(this);
   }
+
+  return context.kind === 'field' ? init : { init };
 }
 
 //- application

src/decorator/getter-deco-returns-invalid.case

@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-createdecoratorcontextobject
+esid: sec-applydecoratorstoelementdefinition
 desc: Decorator can't return an invalid value
 template: getters/error/**/*
 features: [decorators]

src/decorator/getter-deco-returns-replacement.case

@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-createdecoratorcontextobject
+esid: sec-applydecoratorstoelementdefinition
 desc: Can replace a decorated getter with a new getter
 template: getters/standard/**/*
 features: [decorators]

src/decorator/getter-deco-returns-undefined.case

@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-createdecoratorcontextobject
+esid: sec-applydecoratorstoelementdefinition
 desc: Decorator undefined return defaults to previous value
 template: getters/standard/**/*
 features: [decorators]

src/decorator/method-async-deco-returns-replacement.case

@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-createdecoratorcontextobject
+esid: sec-applydecoratorstoelementdefinition
 desc: Can replace a decorated method with a new method
 template: methods/async/**/*
 features: [decorators]

src/decorator/method-async-deco-returns-undefined.case

@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-createdecoratorcontextobject
+esid: sec-applydecoratorstoelementdefinition
 desc: Decorator undefined return defaults to previous value
 template: methods/async/**/*
 features: [decorators]

src/decorator/method-deco-returns-invalid.case

@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-createdecoratorcontextobject
+esid: sec-applydecoratorstoelementdefinition
 desc: Decorator can't return an invalid value
 template: methods/error/**/*
 features: [decorators]

src/decorator/method-deco-returns-replacement.case

@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-createdecoratorcontextobject
+esid: sec-applydecoratorstoelementdefinition
 desc: Can replace a decorated method with a new method
 template: methods/standard/**/*
 features: [decorators]

src/decorator/method-deco-returns-undefined.case

@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-createdecoratorcontextobject
+esid: sec-applydecoratorstoelementdefinition
 desc: Decorator undefined return defaults to previous value
 template: methods/standard/**/*
 features: [decorators]

src/decorator/method-generator-deco-returns-replacement.case

@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-createdecoratorcontextobject
+esid: sec-applydecoratorstoelementdefinition
 desc: Can replace a decorated method with a new method
 template: methods/generator/**/*
 features: [decorators]

src/decorator/method-generator-deco-returns-undefined.case

@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-createdecoratorcontextobject
+esid: sec-applydecoratorstoelementdefinition
 desc: Decorator undefined return defaults to previous value
 template: methods/generator/**/*
 features: [decorators]

src/decorator/setter-deco-returns-invalid.case

@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-createdecoratorcontextobject
+esid: sec-applydecoratorstoelementdefinition
 desc: Decorator can't return an invalid value
 template: setters/error/**/*
 features: [decorators]

src/decorator/setter-deco-returns-replacement.case

@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-createdecoratorcontextobject
+esid: sec-applydecoratorstoelementdefinition
 desc: Can replace a decorated setter with a new setter
 template: setters/standard/**/*
 features: [decorators]

src/decorator/setter-deco-returns-undefined.case

@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: sec-createdecoratorcontextobject
+esid: sec-applydecoratorstoelementdefinition
 desc: Decorator undefined return defaults to previous value
 template: setters/standard/**/*
 features: [decorators]