Update decorators test to meet TypeScript 1.6 specs

TypeStrong · Sep 9, 2015 · 96a6a84 · 96a6a84
1 parent b4d2225
commit 96a6a84
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 17 deletions.
diff --git a/test/converter/decorators/decorators.ts b/test/converter/decorators/decorators.ts
@@ -21,8 +21,8 @@ class DecoratedClass
 /**
  * A decorator with no options.
  */
-function decoratorAtom(target, key, descriptor) {
-    descriptor.writable = false;
+function decoratorAtom(target:Object, propertyKey:string|symbol, descriptor:TypedPropertyDescriptor<any>) {
+    target[propertyKey].writable = true;
 }
 
 
@@ -31,9 +31,9 @@ function decoratorAtom(target, key, descriptor) {
  *
  * @param value  The parameter of this decorator.
  */
-function decoratorWithParam(value:boolean) {
-    return function (target, key, descriptor) {
-        descriptor.enumerable = value;
+function decoratorWithParam(value:boolean):MethodDecorator {
+    return function (target:Object, propertyKey:string|symbol, descriptor:TypedPropertyDescriptor<any>) {
+        target[propertyKey].enumerable = value;
     }
 }
 
@@ -44,8 +44,8 @@ function decoratorWithParam(value:boolean) {
  * @param options  The options object of this decorator.
  * @param options.name  A property on the options object of this decorator.
  */
-function decoratorWithOptions(options:{name:string}) {
-    return function (target, key, descriptor) {
-        descriptor.options = options;
+function decoratorWithOptions(options:{name:string}):ClassDecorator {
+    return function (target) {
+        target.options = options;
     }
 }
diff --git a/test/converter/decorators/specs.json b/test/converter/decorators/specs.json
@@ -123,19 +123,28 @@
                   "kindString": "Parameter",
                   "flags": {},
                   "type": {
-                    "type": "instrinct",
-                    "name": "any"
+                    "type": "reference",
+                    "name": "Object"
                   }
                 },
                 {
                   "id": 8,
-                  "name": "key",
+                  "name": "propertyKey",
                   "kind": 32768,
                   "kindString": "Parameter",
                   "flags": {},
                   "type": {
-                    "type": "instrinct",
-                    "name": "any"
+                    "type": "union",
+                    "types": [
+                      {
+                        "type": "instrinct",
+                        "name": "string"
+                      },
+                      {
+                        "type": "instrinct",
+                        "name": "symbol"
+                      }
+                    ]
                   }
                 },
                 {
@@ -145,8 +154,14 @@
                   "kindString": "Parameter",
                   "flags": {},
                   "type": {
-                    "type": "instrinct",
-                    "name": "any"
+                    "type": "reference",
+                    "name": "TypedPropertyDescriptor",
+                    "typeArguments": [
+                      {
+                        "type": "instrinct",
+                        "name": "any"
+                      }
+                    ]
                   }
                 }
               ],
@@ -229,7 +244,7 @@
               ],
               "type": {
                 "type": "reference",
-                "name": "__function"
+                "name": "ClassDecorator"
               }
             }
           ]
@@ -275,7 +290,7 @@
               ],
               "type": {
                 "type": "reference",
-                "name": "__function"
+                "name": "MethodDecorator"
               }
             }
           ]