fixes 252 The require.js version doesn't generate tests.

mteodori · mteodori · commit cb8f58abcb8a · 2016-03-24T17:14:34.000+01:00
diff --git a/generators/app/index.js b/generators/app/index.js
@@ -163,7 +163,7 @@ var BackboneGenerator = yeoman.generators.Base.extend({
         this.destinationPath('.jshintrc'),
         {
           appName: this.appname,
-          appSlugName: paramCase(this.appname),
+          appSlugName: pascalCase(this.appname),
           includeRequireJS: this.includeRequireJS
         }
       );
@@ -354,20 +354,23 @@ var BackboneGenerator = yeoman.generators.Base.extend({
         'app',
         this.env.options.appPath + '/scripts/main',
         {
-          appSlugName: paramCase(this.appname)
+          appSlugName: pascalCase(this.appname)
         }
       );
     },
 
     composeTest: function () {
       if (['backbone:app', 'backbone'].indexOf(this.options.namespace) >= 0) {
         this.composeWith(this.testFramework, {
-          'skip-install': this.options['skip-install'],
-          'ui': this.options.ui,
-          'skipMessage': true,
+          options: {
+            'skip-install': this.options['skip-install'],
+            'ui': this.options.ui,
+            'skipMessage': true
+          }
         });
       }
     }
+    
   },
 
   setSuffix: function () {
diff --git a/generators/collection/index.js b/generators/collection/index.js
@@ -1,7 +1,6 @@
 /*jshint latedef:false */
 var path = require('path');
 var util = require('util');
-var pascalCase = require('pascal-case');
 var yeoman = require('yeoman-generator');
 var scriptBase = require('../../script-base');
 
@@ -14,19 +13,8 @@ var CollectionGenerator = scriptBase.extend({
   },
 
   writing: {
-    createControllerFiles: function () {
-      this._writeTemplate(
-        'collection',
-        path.join(this.env.options.appPath + '/scripts/collections', this.name),
-        {
-          appClassName: pascalCase(this.appname),
-          className: pascalCase(this.name)
-        }
-      );
-
-      if (!this.options.requirejs) {
-        this._addScriptToIndex('collections/' + this.name);
-      }
+    createCollectionFiles: function () {
+      this._generate('collection');
     },
     composeTest: function () {
       this._generateTest('collection');
diff --git a/generators/model/index.js b/generators/model/index.js
@@ -1,7 +1,5 @@
 /*jshint latedef:false */
-var path = require('path');
 var util = require('util');
-var pascalCase = require('pascal-case');
 var yeoman = require('yeoman-generator');
 var scriptBase = require('../../script-base');
 
@@ -28,18 +26,7 @@ var ModelGenerator = scriptBase.extend({
 
   writing: {
     createModelFiles: function () {
-      this._writeTemplate(
-        'model',
-        path.join(this.env.options.appPath, '/scripts/models', this.name),
-        {
-          appClassName: pascalCase(this.appname),
-          className: pascalCase(this.name)
-        }
-      );
-
-      if (!this.options.requirejs) {
-        this._addScriptToIndex('models/' + this.name);
-      }
+      this._generate('model');
     },
 
     composeTest: function () {
diff --git a/generators/router/index.js b/generators/router/index.js
@@ -1,7 +1,6 @@
 /*jshint latedef:false */
 var path = require('path');
 var util = require('util');
-var pascalCase = require('pascal-case');
 var yeoman = require('yeoman-generator');
 var scriptBase = require('../../script-base');
 
@@ -13,23 +12,12 @@ var RouterGenerator = scriptBase.extend({
   },
 
   writing: {
-    routerFiles: function () {
-      this._writeTemplate(
-        'router',
-        path.join(this.env.options.appPath + '/scripts/routes', this.name),
-        {
-          appClassName: pascalCase(this.appname),
-          className: pascalCase(this.name)
-        }
-      );
-
-      if (!this.options.requirejs) {
-        this._addScriptToIndex('routes/' + this.name);
-      }
+    createRouterFiles: function () {
+      this._generate('router', {}, 'routes');
     },
 
     composeTest: function () {
-      this._generateTest('router');
+      this._generateTest('router', {}, 'routes');
     }
   }
 });
diff --git a/generators/templates/coffeescript/requirejs/collection.coffee b/generators/templates/coffeescript/requirejs/collection.coffee
@@ -1,7 +1,7 @@
 define [
   'underscore'
   'backbone'
-  'models/<%= className %>-model'
+  'models/<%= name %>'
 ], (_, Backbone, <%= className %>Model) ->
 
   class <%= className %>Collection extends Backbone.Collection
diff --git a/generators/templates/coffeescript/requirejs/test/mocha/bdd/collection.coffee b/generators/templates/coffeescript/requirejs/test/mocha/bdd/collection.coffee
@@ -0,0 +1,8 @@
+# global beforeEach, describe, it, assert, expect
+'use strict'
+
+<%= className %> = require('collections/<%= name %>')
+
+describe '<%= className %> Collection', ->
+  beforeEach ->
+    @<%= className %>Collection = new <%= className %>()
diff --git a/generators/templates/coffeescript/requirejs/test/mocha/bdd/model.coffee b/generators/templates/coffeescript/requirejs/test/mocha/bdd/model.coffee
@@ -0,0 +1,8 @@
+# global beforeEach, describe, it, assert, expect
+'use strict'
+
+<%= className %> = require('models/<%= name %>')
+
+describe '<%= className %> Model', ->
+  beforeEach ->
+    @<%= className %>Model = new <%= className %>();
diff --git a/generators/templates/coffeescript/requirejs/test/mocha/bdd/router.coffee b/generators/templates/coffeescript/requirejs/test/mocha/bdd/router.coffee
@@ -0,0 +1,11 @@
+# global beforeEach, describe, it, assert, expect
+'use strict'
+
+<%= className %> = require('routes/<%= name %>')
+
+describe '<%= className %> Router', ->
+  beforeEach ->
+    @<%= className %>Router = new <%= className %>();
+
+  it 'index route', ->
+
diff --git a/generators/templates/coffeescript/requirejs/test/mocha/bdd/view.coffee b/generators/templates/coffeescript/requirejs/test/mocha/bdd/view.coffee
@@ -0,0 +1,8 @@
+# global beforeEach, describe, it, assert, expect
+'use strict'
+
+<%= className %> = require('views/<%= name %>')
+
+describe '<%= className %> View', ->
+  beforeEach ->
+    @<%= className %>View = new <%= className %>();
diff --git a/generators/templates/coffeescript/requirejs/test/mocha/tdd/collection.coffee b/generators/templates/coffeescript/requirejs/test/mocha/tdd/collection.coffee
@@ -0,0 +1,8 @@
+# global suite, test, assert, setup, bb
+'use strict';
+
+<%= className %> = require('collections/<%= name %>')
+
+suite '<%= className %> Collection', ->
+  setup ->
+    @<%= className %>Collection = new <%= className %>()
diff --git a/generators/templates/coffeescript/requirejs/test/mocha/tdd/model.coffee b/generators/templates/coffeescript/requirejs/test/mocha/tdd/model.coffee
@@ -0,0 +1,8 @@
+# global suite, test, assert, setup, bb
+'use strict';
+
+<%= className %> = require('models/<%= name %>')
+
+suite '<%= className %> Model', ->
+  setup ->
+    @<%= className %>Model = new <%= className %>()
diff --git a/generators/templates/coffeescript/requirejs/test/mocha/tdd/router.coffee b/generators/templates/coffeescript/requirejs/test/mocha/tdd/router.coffee
@@ -0,0 +1,8 @@
+# global suite, test, assert, setup, bb
+'use strict';
+
+<%= className %> = require('routes/<%= name %>')
+
+suite '<%= className %> Router', ->
+  setup ->
+    @<%= className %>Router = new <%= className %>()
diff --git a/generators/templates/coffeescript/requirejs/test/mocha/tdd/view.coffee b/generators/templates/coffeescript/requirejs/test/mocha/tdd/view.coffee
@@ -0,0 +1,8 @@
+# global suite, test, assert, setup, bb
+'use strict';
+
+<%= className %> = require('views/<%= name %>')
+
+suite '<%= className %> View', ->
+  setup ->
+    @<%= className %>View = new <%= className %>()
diff --git a/generators/templates/coffeescript/test/mocha/bdd/collection.coffee b/generators/templates/coffeescript/test/mocha/bdd/collection.coffee
@@ -0,0 +1,6 @@
+# global beforeEach, describe, it, assert, expect
+'use strict'
+
+describe '<%= className %> Collection', ->
+  beforeEach ->
+    @<%= className %>Collection = new <%= appClassName %>.Collections.<%= className %>()
diff --git a/generators/templates/coffeescript/test/mocha/bdd/model.coffee b/generators/templates/coffeescript/test/mocha/bdd/model.coffee
@@ -0,0 +1,6 @@
+# global beforeEach, describe, it, assert, expect
+'use strict'
+
+describe '<%= className %> Model', ->
+  beforeEach ->
+    @<%= className %>Model = new <%= appClassName %>.Models.<%= className %>();
diff --git a/generators/templates/coffeescript/test/mocha/bdd/router.coffee b/generators/templates/coffeescript/test/mocha/bdd/router.coffee
@@ -0,0 +1,9 @@
+# global beforeEach, describe, it, assert, expect
+'use strict'
+
+describe '<%= className %> Router', ->
+  beforeEach ->
+    @<%= className %>Router = new <%= appClassName %>.Routers.<%= className %>();
+
+  it 'index route', ->
+
diff --git a/generators/templates/coffeescript/test/mocha/bdd/view.coffee b/generators/templates/coffeescript/test/mocha/bdd/view.coffee
@@ -0,0 +1,6 @@
+# global beforeEach, describe, it, assert, expect
+'use strict'
+
+describe '<%= className %> View', ->
+  beforeEach ->
+    @<%= className %>View = new <%= appClassName %>.Views.<%= className %>();
diff --git a/generators/templates/coffeescript/test/mocha/tdd/collection.coffee b/generators/templates/coffeescript/test/mocha/tdd/collection.coffee
@@ -0,0 +1,6 @@
+# global suite, test, assert, setup, bb
+'use strict';
+
+suite '<%= className %> Collection', ->
+  setup ->
+    @<%= className %>Collection = new <%= appClassName %>.Collections.<%= className %>()
diff --git a/generators/templates/coffeescript/test/mocha/tdd/model.coffee b/generators/templates/coffeescript/test/mocha/tdd/model.coffee
@@ -0,0 +1,6 @@
+# global suite, test, assert, setup, bb
+'use strict';
+
+suite '<%= className %> Model', ->
+  setup ->
+    @<%= className %>Model = new <%= appClassName %>.Models.<%= className %>()
diff --git a/generators/templates/coffeescript/test/mocha/tdd/router.coffee b/generators/templates/coffeescript/test/mocha/tdd/router.coffee
@@ -0,0 +1,6 @@
+# global suite, test, assert, setup, bb
+'use strict';
+
+suite '<%= className %> Router', ->
+  setup ->
+    @<%= className %>Router = new <%= appClassName %>.Routers.<%= className %>()
diff --git a/generators/templates/coffeescript/test/mocha/tdd/view.coffee b/generators/templates/coffeescript/test/mocha/tdd/view.coffee
@@ -0,0 +1,6 @@
+# global suite, test, assert, setup, bb
+'use strict';
+
+suite '<%= className %> View', ->
+  setup ->
+    @<%= className %>View = new <%= appClassName %>.Views.<%= className %>()
diff --git a/generators/templates/collection.js b/generators/templates/collection.js
@@ -1,5 +1,6 @@
 /*global <%= appClassName %>, Backbone*/
 
+<%= appClassName %> = window.<%= appClassName %> || {};
 <%= appClassName %>.Collections = <%= appClassName %>.Collections || {};
 
 (function () {
diff --git a/generators/templates/model.js b/generators/templates/model.js
@@ -1,5 +1,6 @@
 /*global <%= appClassName %>, Backbone*/
 
+<%= appClassName %> = window.<%= appClassName %> || {};
 <%= appClassName %>.Models = <%= appClassName %>.Models || {};
 
 (function () {
diff --git a/generators/templates/requirejs/collection.js b/generators/templates/requirejs/collection.js
@@ -3,7 +3,7 @@
 define([
   'underscore',
   'backbone',
-  'models/<%= className %>'
+  'models/<%= name %>'
 ], function (_, Backbone, <%= className %>Model) {
   'use strict';
 
diff --git a/generators/templates/requirejs/test/mocha/bdd/collection.js b/generators/templates/requirejs/test/mocha/bdd/collection.js
@@ -0,0 +1,12 @@
+/*global beforeEach, describe, it, assert, expect*/
+'use strict';
+
+var <%= className %> = require('collections/<%= name %>');
+
+describe('<%= className %> Collection', function () {
+
+    beforeEach(function () {
+        this.<%= name %>Collection = new <%= className %>();
+    });
+
+});
diff --git a/generators/templates/requirejs/test/mocha/bdd/model.js b/generators/templates/requirejs/test/mocha/bdd/model.js
@@ -0,0 +1,12 @@
+/*global beforeEach, describe, it, assert, expect*/
+'use strict';
+
+var <%= className %> = require('models/<%= name %>');
+
+describe('<%= className %> Model', function () {
+
+    beforeEach(function () {
+        this.<%= name %>Model = new <%= className %>();
+    });
+
+});
diff --git a/generators/templates/requirejs/test/mocha/bdd/router.js b/generators/templates/requirejs/test/mocha/bdd/router.js
@@ -0,0 +1,16 @@
+/*global beforeEach, describe, it, assert, expect*/
+'use strict';
+
+var <%= className %> = require('routes/<%= name %>');
+
+describe('<%= className %> Router', function () {
+
+    beforeEach(function () {
+        this.<%= name %>Router = new <%= className %>();
+    });
+
+    it('index route', function(){
+
+    });
+
+});
diff --git a/generators/templates/requirejs/test/mocha/bdd/view.js b/generators/templates/requirejs/test/mocha/bdd/view.js
@@ -0,0 +1,12 @@
+/*global beforeEach, describe, it, assert, expect*/
+'use strict';
+
+var <%= className %> = require('views/<%= name %>');
+
+describe('<%= className %> View', function () {
+
+    beforeEach(function () {
+        this.<%= name %>View = new <%= className %>();
+    });
+
+});
diff --git a/generators/templates/requirejs/test/mocha/tdd/collection.js b/generators/templates/requirejs/test/mocha/tdd/collection.js
@@ -0,0 +1,12 @@
+/*global suite, test, assert, setup, bb*/
+'use strict';
+
+var <%= className %> = require('collections/<%= name %>');
+
+suite('<%= className %> Collection', function () {
+
+    setup(function () {
+        this.<%= name %>Collection = new <%= className %>();
+    });
+
+});
diff --git a/generators/templates/requirejs/test/mocha/tdd/model.js b/generators/templates/requirejs/test/mocha/tdd/model.js
@@ -0,0 +1,12 @@
+/*global suite, test, assert, setup, bb*/
+'use strict';
+
+var <%= className %> = require('models/<%= name %>');
+
+suite('<%= className %> Model', function () {
+
+    setup(function () {
+        this.<%= name %>Model = new <%= className %>();
+    });
+
+});
diff --git a/generators/templates/requirejs/test/mocha/tdd/router.js b/generators/templates/requirejs/test/mocha/tdd/router.js
@@ -0,0 +1,12 @@
+/*global suite, test, assert, setup, bb*/
+'use strict';
+
+var <%= className %> = require('routes/<%= name %>');
+
+suite('<%= className %> Router', function () {
+
+    setup(function () {
+        this.<%= name %>Router = new <%= className %>();
+    });
+
+});
diff --git a/generators/templates/requirejs/test/mocha/tdd/view.js b/generators/templates/requirejs/test/mocha/tdd/view.js
diff --git a/generators/templates/router.js b/generators/templates/router.js
diff --git a/generators/templates/test/mocha/bdd/collection.js b/generators/templates/test/mocha/bdd/collection.js
diff --git a/generators/templates/test/mocha/bdd/model.js b/generators/templates/test/mocha/bdd/model.js
diff --git a/generators/templates/test/mocha/bdd/router.js b/generators/templates/test/mocha/bdd/router.js
diff --git a/generators/templates/test/mocha/bdd/view.js b/generators/templates/test/mocha/bdd/view.js
diff --git a/generators/templates/test/mocha/tdd/collection.js b/generators/templates/test/mocha/tdd/collection.js
diff --git a/generators/templates/test/mocha/tdd/model.js b/generators/templates/test/mocha/tdd/model.js
diff --git a/generators/templates/test/mocha/tdd/router.js b/generators/templates/test/mocha/tdd/router.js
diff --git a/generators/templates/test/mocha/tdd/view.js b/generators/templates/test/mocha/tdd/view.js
diff --git a/generators/templates/view.js b/generators/templates/view.js
diff --git a/generators/view/index.js b/generators/view/index.js
diff --git a/package.json b/package.json
diff --git a/script-base.js b/script-base.js

Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ var BackboneGenerator = yeoman.generators.Base.extend({`
`163`	`163`	`this.destinationPath('.jshintrc'),`
`164`	`164`	`{`
`165`	`165`	`appName: this.appname,`
`166`		`- appSlugName: paramCase(this.appname),`
	`166`	`+ appSlugName: pascalCase(this.appname),`
`167`	`167`	`includeRequireJS: this.includeRequireJS`
`168`	`168`	`}`
`169`	`169`	`);`
`@@ -354,20 +354,23 @@ var BackboneGenerator = yeoman.generators.Base.extend({`
`354`	`354`	`'app',`
`355`	`355`	`this.env.options.appPath + '/scripts/main',`
`356`	`356`	`{`
`357`		`- appSlugName: paramCase(this.appname)`
	`357`	`+ appSlugName: pascalCase(this.appname)`
`358`	`358`	`}`
`359`	`359`	`);`
`360`	`360`	`},`
`361`	`361`
`362`	`362`	`composeTest: function () {`
`363`	`363`	`if (['backbone:app', 'backbone'].indexOf(this.options.namespace) >= 0) {`
`364`	`364`	`this.composeWith(this.testFramework, {`
`365`		`- 'skip-install': this.options['skip-install'],`
`366`		`- 'ui': this.options.ui,`
`367`		`- 'skipMessage': true,`
	`365`	`+ options: {`
	`366`	`+ 'skip-install': this.options['skip-install'],`
	`367`	`+ 'ui': this.options.ui,`
	`368`	`+ 'skipMessage': true`
	`369`	`+ }`
`368`	`370`	`});`
`369`	`371`	`}`
`370`	`372`	`}`
	`373`	`+`
`371`	`374`	`},`
`372`	`375`
`373`	`376`	`setSuffix: function () {`