Add tests for @resource

ulfryk · ulfryk · commit 497c10ebea3d · 2015-06-30T07:33:09.000+02:00
diff --git a/README.md b/README.md
@@ -1,22 +1,23 @@
 Angular-TypeScript
 ==================
 
+[![GitHub version](https://badge.fury.io/gh/ulfryk%2Fangular-typescript.svg)](http://badge.fury.io/gh/ulfryk%2Fangular-typescript)
 [![Build Status](https://travis-ci.org/ulfryk/angular-typescript.svg)](https://travis-ci.org/ulfryk/angular-typescript)
 [![Coverage Status](https://coveralls.io/repos/ulfryk/angular-typescript/badge.svg?branch=master)](https://coveralls.io/r/ulfryk/angular-typescript?branch=master)
 
 
-
 [![npm version](https://badge.fury.io/js/angular-typescript.svg)](http://badge.fury.io/js/angular-typescript)
 [![Dependency Status](https://www.versioneye.com/user/projects/5591b8f9396561001900009b/badge.svg?style=flat)](https://www.versioneye.com/user/projects/5591b8f9396561001900009b)
 
 
-
 [![Bower version](https://badge.fury.io/bo/angular-typescript.svg)](http://badge.fury.io/bo/angular-typescript)
 [![Dependency Status](https://www.versioneye.com/user/projects/5591b93039656100200000a9/badge.svg?style=flat)](https://www.versioneye.com/user/projects/5591b93039656100200000a9)
 
 
 
-[![GitHub version](https://badge.fury.io/gh/ulfryk%2Fangular-typescript.svg)](http://badge.fury.io/gh/ulfryk%2Fangular-typescript)
+> TypeScript 1.5 annotations (decorators) for AngularJS 1.x 
 
+Docs
+----
 
-> Explanations will come…
+Explanations will come…
diff --git a/at-angular-resource.ts b/at-angular-resource.ts
@@ -1,3 +1,4 @@
+/* istanbul ignore next */
 
 module at {
 
@@ -49,7 +50,7 @@ module at {
                     }))
                 })), ...args);
             }
-            resourceClassFactory.$inject = (['$resource']).concat(target.$inject || []);
+            resourceClassFactory.$inject = (['$resource']).concat(target.$inject /* istanbul ignore next */ || []);
             angular.module(moduleName).factory(className, resourceClassFactory);
         };
     }
diff --git a/at-angular.ts b/at-angular.ts
@@ -56,15 +56,16 @@ module at {
     export function directive(moduleName: string, directiveName: string): at.IClassAnnotationDecorator {
         return (target: any): void => {
             var config: angular.IDirective;
+            /* istanbul ignore else */
             if (target.controller) {
                 controller(moduleName, target.controller.split(' ').shift())(target);
             }
             config = directiveProperties.reduce((
                 config: angular.IDirective,
                 property: string
             ) => {
-                return angular.isDefined(target[property]) ?
-                    angular.extend(config, {[property]: target[property]}) : config;
+                return angular.isDefined(target[property]) ? angular.extend(config, {[property]: target[property]}) :
+                    config; /* istanbul ignore next */
             }, {controller: target, scope: Boolean(target.templateUrl)});
 
             angular.module(moduleName).directive(directiveName, () => (config));
@@ -76,6 +77,7 @@ module at {
             function factory(...args: any[]): any {
                 return at.attachInjects(target, ...args);
             }
+            /* istanbul ignore else */
             if (target.$inject && target.$inject.length > 0) {
                 factory.$inject = target.$inject.slice(0);
             }
diff --git a/gulp/karma.conf.js b/gulp/karma.conf.js
@@ -3,18 +3,15 @@ module.exports = function (config) {
         basePath: '',
         files: [
             '../bower_components/angular/angular.js',
-            '../bower_components/angular-mocks/angular-mocks.js',
+            '../.tmp/at-angular.js',
             '../bower_components/angular-resource/angular-resource.js',
-            '../.tmp/angular.js',
-            '../.tmp/resource.js',
+            '../.tmp/at-angular-resource.js',
+            '../bower_components/angular-mocks/angular-mocks.js',
             '../.tmp/module.js',
             '../.tmp/*.js',
             '../test/*.coffee'
         ],
-        exclude: [
-            '../.tmp/js/modules/**/*-run.js',
-            '../.tmp/js/modules/app/configs/**/*.js'
-        ],
+        exclude: [],
         reporters: ['dots', 'coverage'],
         port: 9876,
         runnerPort: 9100,
diff --git a/gulp/ts.js b/gulp/ts.js
@@ -7,7 +7,7 @@ var ts = require('gulp-typescript');
 var tslint = require('gulp-tslint');
 
 gulp.task('ts-build', function () {
-    return gulp.src(['*.ts', 'ts/**/*.d.ts', 'test/**/*.ts']).pipe(ts({
+    return gulp.src(['at-*.ts', 'ts/**/*.d.ts', 'test/**/*.ts']).pipe(ts({
         declarationFiles: false,
         noExternalResolve: true,
         target: 'ES5',
@@ -16,7 +16,7 @@ gulp.task('ts-build', function () {
 });
 
 gulp.task('ts-lint', function () {
-    return gulp.src(['*.ts', 'test/**/*.ts'])
+    return gulp.src(['at-*.ts', 'test/**/*.ts'])
         .pipe(tslint({configuration: {rules: require('../ts/tslint.json')}}))
         .pipe(tslint.report('verbose'));
 });
diff --git a/test/class-factory.ts b/test/class-factory.ts
@@ -1,4 +1,4 @@
-/* istanbul ignore if */
+/* istanbul ignore next */
 
 module test {
 
diff --git a/test/controller.ts b/test/controller.ts
@@ -1,4 +1,4 @@
-/* istanbul ignore if */
+/* istanbul ignore if else */
 
 module test {
 
diff --git a/test/directive.ts b/test/directive.ts
@@ -1,4 +1,4 @@
-/* istanbul ignore if */
+/* istanbul ignore if else */
 
 module test {
 
diff --git a/test/inject-and-service.ts b/test/inject-and-service.ts
@@ -1,4 +1,4 @@
-/* istanbul ignore if */
+/* istanbul ignore if else */
 
 module test {
 
diff --git a/test/inject.ts b/test/inject.ts
@@ -1,4 +1,4 @@
-/* istanbul ignore if */
+/* istanbul ignore if else */
 
 module test {
 
diff --git a/test/resource-spec.coffee b/test/resource-spec.coffee
@@ -0,0 +1,71 @@
+'use strict';
+
+describe 'annotations:', ->
+
+  beforeEach module 'test'
+
+  describe '@resource (with @inject)', ->
+    $http = null
+    $parse = null
+    $resource = null
+    TestResourceOne = null
+
+    beforeEach inject (_$http_, _$parse_, _$resource_, _TestResourceOne_) ->
+      $http = _$http_
+      $parse = _$parse_
+      $resource = _$resource_
+      TestResourceOne = _TestResourceOne_
+
+    it 'should prepare decorated resource class as new service', ->
+
+      expect TestResourceOne
+      .toBeDefined()
+
+    it 'should copy all class features to provided resource class', ->
+
+      Object.keys(angular.extend({}, test.TestResourceOne)).forEach (key) ->
+        expect TestResourceOne[key]
+        .toEqual test.TestResourceOne[key]
+
+      Object.keys(angular.extend({}, test.TestResourceOne.prototype)).forEach (key) ->
+        expect TestResourceOne.prototype[key]
+        .toEqual test.TestResourceOne.prototype[key]
+
+    it 'should assign proper $inject array to service constructor', ->
+
+      expect test.TestResourceOne.$inject
+      .toEqual ['$http', '$parse']
+
+      expect TestResourceOne.$inject
+      .toEqual ['$http', '$parse']
+
+    it 'should make mix of class instance and resource instance (on new)', ->
+      instance = new TestResourceOne name: 'Grants', age: 15
+      Resource = $resource test.TestResourceOne.url
+      resource = new Resource name: 'Grants', age: 15
+
+      for key, value of resource
+        expect resource[key]?.toString()
+        .toEqual instance[key]?.toString()
+
+    it 'should make proper class instance (on new)', ->
+      model = name: ' :: THE NAME :: ', age: 1001.1
+      instance = new TestResourceOne model
+      fakeInstance = new test.TestResourceOne model
+
+      expect instance.name
+      .toBe model.name
+
+      expect instance.age
+      .toBe model.age
+
+      expect fakeInstance.name
+      .toBe model.name
+
+      expect fakeInstance.age
+      .toBe model.age
+
+      expect instance.getLabel()
+      .toBe 'application/json, text/plain, */* :: THE NAME :: 1001.1'
+
+
diff --git a/test/resource.ts b/test/resource.ts
@@ -0,0 +1,41 @@
+/* istanbul ignore next */
+
+module test {
+
+    'use strict';
+
+    interface ITestModel {
+        name: string;
+        age: number;
+    }
+
+    @at.resource('test', 'TestResourceOne')
+    @at.inject('$http', '$parse')
+    export class TestResourceOne implements ITestModel {
+        // And to keep proper type, you may add "extends at.Resource"
+
+        public static url: string = '/fake/url';
+
+        public name: string;
+        public age: number;
+
+        /* tslint:disable:variable-name */
+        private $_$http: angular.IHttpService;
+        private $_$parse: angular.IParseService;
+        /* tslint:enable:variable-name */
+
+        constructor(model?: ITestModel) {
+            /* istanbul ignore else */
+            if (model) {
+                this.name = model.name;
+                this.age = model.age;
+            }
+        }
+
+        public getLabel(): string {
+            return this.$_$parse('defaults.headers.common.Accept')(this.$_$http) + this.name + String(this.age);
+        }
+
+    }
+
+}
diff --git a/test/service.ts b/test/service.ts
@@ -1,4 +1,4 @@
-/* istanbul ignore if */
+/* istanbul ignore if else */
 
 module test {
 

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+/* istanbul ignore next */`
`1`	`2`
`2`	`3`	`module at {`
`3`	`4`
`@@ -49,7 +50,7 @@ module at {`
`49`	`50`	`}))`
`50`	`51`	`})), ...args);`
`51`	`52`	`}`
`52`		`- resourceClassFactory.$inject = (['$resource']).concat(target.$inject \|\| []);`
	`53`	`+ resourceClassFactory.$inject = (['$resource']).concat(target.$inject /* istanbul ignore next */ \|\| []);`
`53`	`54`	`angular.module(moduleName).factory(className, resourceClassFactory);`
`54`	`55`	`};`
`55`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* istanbul ignore if */`
	`1`	`+/* istanbul ignore next */`
`2`	`2`
`3`	`3`	`module test {`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* istanbul ignore if */`
	`1`	`+/* istanbul ignore if else */`
`2`	`2`
`3`	`3`	`module test {`
`4`	`4`