Merge branch 'release/1.0.0-rc.16'

hirsch88 · Jun 5, 2015 · 08af7c1 · 08af7c1
2 parents b59ac77 + 531bfdd
commit 08af7c1
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 36 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+1.0.0-rc.16 / 2015-06-05
+==================
+
+  * Release 1.0.0-rc.16
+  * Added Pull-Request TypeScript support
+  * Added filter generator
+  * Fixed unit test templates
+
 1.0.0-rc.15 / 2015-06-04
 ==================
 

diff --git a/app/templates/tasks/dist-server.js b/app/templates/tasks/dist-server.js
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "generator-hirsch",
-  "version": "1.0.0-rc.15",
-  "description": "Yeoman generator for large module-based AngularJS applications",
+  "version": "1.0.0-rc.16",
+  "description": "Yeoman generator for large module-based AngularJS applications with the option to use typescript",
   "license": "MIT",
   "main": "app/index.js",
   "repository": "[email protected]/generator-hirsch",

diff --git a/templates/javascript/directive.unit.spec.js b/templates/javascript/directive.unit.spec.js
@@ -3,7 +3,7 @@
 describe('Unit: <%= prefix %>.<%= module %>.directives.<%= classedName %>', function () {
   var $compile, $rootScope;
 
-  beforeEach(module('<%= prefix %>.<%= module %>.directives'));
+  beforeEach(module('<%= prefix %>.<%= module %>.directives.<%= classedName %>'));
 
   beforeEach(angular.mock.inject(['$compile', '$rootScope', function($c, $r){
     $compile = $c;

diff --git a/templates/javascript/factory.unit.spec.js b/templates/javascript/factory.unit.spec.js
@@ -3,7 +3,7 @@
 describe('Unit: <%= prefix %>.<%= module %>.services.<%= classedName %>', function () {
 
   var <%= prefix %><%= classedName %>;
-  beforeEach(module('<%= prefix %>'));
+  beforeEach(module('<%= prefix %>.<%= module %>.services.<%= classedName %>'));
   beforeEach(inject(function (_<%= prefix %><%= classedName %>_) {
     <%= prefix %><%= classedName %> = _<%= prefix %><%= classedName %>_;
   }));

diff --git a/templates/javascript/filter.js b/templates/javascript/filter.js
@@ -2,7 +2,7 @@
   'use strict';
 
   angular
-    .module('<%= appname %>.<%= module %>.filters.<%= classedName %>', [])
+    .module('<%= prefix %>.<%= module %>.filters.<%= classedName %>', [])
     .filter('<%= prefix %><%= classedName %>', <%= classedName %>Filter);
 
   function <%= classedName %>Filter() {
@@ -15,7 +15,7 @@
 
       // code goes here
 
-      return input;
+      return input + 'Filter';
     }
 
   }

diff --git a/templates/javascript/filter.unit.spec.js b/templates/javascript/filter.unit.spec.js
@@ -2,13 +2,18 @@
 
 describe('Unit: <%= prefix %>.<%= module %>.filters.<%= classedName %>', function () {
 
-  beforeEach(module('app'));
+  beforeEach(module('<%= prefix %>.<%= module %>.filters.<%= classedName %>'));
 
-  it('should contain an <%= prefix %>.<%= module %>.filters.<%= classedName %> filter',
-    inject(function (<%= prefix %><%= classedName %>) {
-      expect(<%= prefix %><%= classedName %>).not.to.equal(null);
-    })
-  );
+  it('should have a <%= prefix %><%= classedName %> filter', inject(function($filter) {
+    expect($filter('<%= prefix %><%= classedName %>')).not.to.equal(null);
+  }));
 
+  it('should have a <%= prefix %><%= classedName %> filter that produces an string',
+    inject(function($filter) {
+
+      var filter = $filter('<%= prefix %><%= classedName %>')('bubu');
+      expect(filter).to.be.a('string');
+      expect(filter).to.equal('bubuFilter');
+    }));
 
 });
diff --git a/templates/javascript/service.unit.spec.js b/templates/javascript/service.unit.spec.js
@@ -3,7 +3,7 @@
 describe('Unit: <%= prefix %>.<%= module %>.services.<%= classedName %>', function () {
 
   var <%= prefix %><%= classedName %>;
-  beforeEach(module('<%= prefix %>'));
+  beforeEach(module('<%= prefix %>.<%= module %>.services.<%= classedName %>'));
   beforeEach(inject(function (_<%= prefix %><%= classedName %>_) {
     <%= prefix %><%= classedName %> = _<%= prefix %><%= classedName %>_;
   }));