removed mocha ui option and set to bdd

yeoman · Mar 26, 2016 · 4722c3d · 4722c3d
1 parent cb8f58a
commit 4722c3d
Show file tree

Hide file tree

Showing 34 changed files with 3 additions and 162 deletions.
diff --git a/generators/app/index.js b/generators/app/index.js
@@ -53,7 +53,6 @@ var BackboneGenerator = yeoman.generators.Base.extend({
 
     this.config.defaults({
       appName: this.appname,
-      ui: this.options.ui,
       coffee: this.options.coffee,
       testFramework: this.testFramework,
       templateFramework: this.templateFramework,
@@ -364,13 +363,13 @@ var BackboneGenerator = yeoman.generators.Base.extend({
         this.composeWith(this.testFramework, {
           options: {
             'skip-install': this.options['skip-install'],
-            'ui': this.options.ui,
+            'ui': 'bdd',
             'skipMessage': true
           }
         });
       }
     }
-    
+
   },
 
   setSuffix: function () {

diff --git a/...equirejs/test/mocha/bdd/collection.coffee → ...pt/requirejs/test/mocha/collection.coffee b/...equirejs/test/mocha/bdd/collection.coffee → ...pt/requirejs/test/mocha/collection.coffee
diff --git a/...ipt/requirejs/test/mocha/bdd/model.coffee → ...escript/requirejs/test/mocha/model.coffee b/...ipt/requirejs/test/mocha/bdd/model.coffee → ...escript/requirejs/test/mocha/model.coffee
diff --git a/...pt/requirejs/test/mocha/bdd/router.coffee → ...script/requirejs/test/mocha/router.coffee b/...pt/requirejs/test/mocha/bdd/router.coffee → ...script/requirejs/test/mocha/router.coffee
diff --git a/generators/templates/coffeescript/requirejs/test/mocha/tdd/collection.coffee b/generators/templates/coffeescript/requirejs/test/mocha/tdd/collection.coffee
diff --git a/generators/templates/coffeescript/requirejs/test/mocha/tdd/model.coffee b/generators/templates/coffeescript/requirejs/test/mocha/tdd/model.coffee
diff --git a/generators/templates/coffeescript/requirejs/test/mocha/tdd/router.coffee b/generators/templates/coffeescript/requirejs/test/mocha/tdd/router.coffee
diff --git a/generators/templates/coffeescript/requirejs/test/mocha/tdd/view.coffee b/generators/templates/coffeescript/requirejs/test/mocha/tdd/view.coffee
diff --git a/...ript/requirejs/test/mocha/bdd/view.coffee → ...eescript/requirejs/test/mocha/view.coffee b/...ript/requirejs/test/mocha/bdd/view.coffee → ...eescript/requirejs/test/mocha/view.coffee
diff --git a/...eescript/test/mocha/bdd/collection.coffee → ...coffeescript/test/mocha/collection.coffee b/...eescript/test/mocha/bdd/collection.coffee → ...coffeescript/test/mocha/collection.coffee
diff --git a/.../coffeescript/test/mocha/bdd/model.coffee → ...ates/coffeescript/test/mocha/model.coffee b/.../coffeescript/test/mocha/bdd/model.coffee → ...ates/coffeescript/test/mocha/model.coffee
diff --git a/...coffeescript/test/mocha/bdd/router.coffee → ...tes/coffeescript/test/mocha/router.coffee b/...coffeescript/test/mocha/bdd/router.coffee → ...tes/coffeescript/test/mocha/router.coffee
diff --git a/generators/templates/coffeescript/test/mocha/tdd/collection.coffee b/generators/templates/coffeescript/test/mocha/tdd/collection.coffee
diff --git a/generators/templates/coffeescript/test/mocha/tdd/model.coffee b/generators/templates/coffeescript/test/mocha/tdd/model.coffee
diff --git a/generators/templates/coffeescript/test/mocha/tdd/router.coffee b/generators/templates/coffeescript/test/mocha/tdd/router.coffee
diff --git a/generators/templates/coffeescript/test/mocha/tdd/view.coffee b/generators/templates/coffeescript/test/mocha/tdd/view.coffee
diff --git a/...s/coffeescript/test/mocha/bdd/view.coffee → ...lates/coffeescript/test/mocha/view.coffee b/...s/coffeescript/test/mocha/bdd/view.coffee → ...lates/coffeescript/test/mocha/view.coffee
diff --git a/...es/requirejs/test/mocha/bdd/collection.js → ...plates/requirejs/test/mocha/collection.js b/...es/requirejs/test/mocha/bdd/collection.js → ...plates/requirejs/test/mocha/collection.js
diff --git a/...mplates/requirejs/test/mocha/bdd/model.js → ...s/templates/requirejs/test/mocha/model.js b/...mplates/requirejs/test/mocha/bdd/model.js → ...s/templates/requirejs/test/mocha/model.js
diff --git a/...plates/requirejs/test/mocha/bdd/router.js → .../templates/requirejs/test/mocha/router.js b/...plates/requirejs/test/mocha/bdd/router.js → .../templates/requirejs/test/mocha/router.js
diff --git a/generators/templates/requirejs/test/mocha/tdd/collection.js b/generators/templates/requirejs/test/mocha/tdd/collection.js
diff --git a/generators/templates/requirejs/test/mocha/tdd/model.js b/generators/templates/requirejs/test/mocha/tdd/model.js
diff --git a/generators/templates/requirejs/test/mocha/tdd/router.js b/generators/templates/requirejs/test/mocha/tdd/router.js
diff --git a/generators/templates/requirejs/test/mocha/tdd/view.js b/generators/templates/requirejs/test/mocha/tdd/view.js
diff --git a/...emplates/requirejs/test/mocha/bdd/view.js → ...rs/templates/requirejs/test/mocha/view.js b/...emplates/requirejs/test/mocha/bdd/view.js → ...rs/templates/requirejs/test/mocha/view.js
diff --git a/...rs/templates/test/mocha/bdd/collection.js → ...rators/templates/test/mocha/collection.js b/...rs/templates/test/mocha/bdd/collection.js → ...rators/templates/test/mocha/collection.js
diff --git a/generators/templates/test/mocha/bdd/model.js → generators/templates/test/mocha/model.js b/generators/templates/test/mocha/bdd/model.js → generators/templates/test/mocha/model.js
diff --git a/...rators/templates/test/mocha/bdd/router.js → generators/templates/test/mocha/router.js b/...rators/templates/test/mocha/bdd/router.js → generators/templates/test/mocha/router.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/test/mocha/bdd/view.js → generators/templates/test/mocha/view.js b/generators/templates/test/mocha/bdd/view.js → generators/templates/test/mocha/view.js
diff --git a/script-base.js b/script-base.js
@@ -77,20 +77,6 @@ var ScriptBase = yeoman.generators.NamedBase.extend({
     return this.config.get('testFramework') === 'mocha';
   },
 
-  _getMochaUi: function() {
-    var ui = this.config.get('ui');
-
-    if (!ui) {
-      try {
-        ui = require(path.join(process.cwd(), '.yo-rc.json'))['generator-mocha'].ui;
-      } catch (e) {
-        ui = 'bdd';
-      }
-    }
-
-    return ui;
-  },
-
   _getGenerateOptions: function (options) {
     options = options || {};
     options.appClassName = options.appClassName || pascalCase(this.appname);
@@ -117,7 +103,7 @@ var ScriptBase = yeoman.generators.NamedBase.extend({
       dest = dest || type + 's';
 
       this._writeTemplate(
-        path.join('test', this.config.get('testFramework'), this._getMochaUi(), type),
+        path.join('test', this.config.get('testFramework'), type),
         path.join('test', 'spec', dest, this.name + '.spec'),
         this._getGenerateOptions(options)
       );