Skip to content
This repository has been archived by the owner on Jul 8, 2020. It is now read-only.

Commit

Permalink
work on #241: controller -> generators/controller
Browse files Browse the repository at this point in the history
  • Loading branch information
@gruppjo
gruppjo committed Sep 3, 2015
1 parent c58f867 commit 4485416
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion controller/index.js → generators/controller/index.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict';
var yeoman = require('yeoman-generator');
var utils = require('../utils/utils.js');
var utils = require('../../utils/utils.js');

var MGenerator = yeoman.generators.NamedBase.extend({

Expand Down
0 controller/templates/_controller.js → ...ators/controller/templates/_controller.js
View file
File renamed without changes.
0 controller/templates/_controller.spec.js → .../controller/templates/_controller.spec.js
View file
File renamed without changes.
14 changes: 7 additions & 7 deletions test/app.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ describe('m', function () {
.withGenerators([ // configure path to subgenerators
path.join(__dirname, '../module'),
path.join(__dirname, '../generators/constant'),
path.join(__dirname, '../controller'),
path.join(__dirname, '../generators/controller'),
path.join(__dirname, '../template'),
path.join(__dirname, '../service')
])
Expand Down Expand Up @@ -131,7 +131,7 @@ describe('m', function () {
.withGenerators([ // configure path to subgenerators
path.join(__dirname, '../module'),
path.join(__dirname, '../generators/constant'),
path.join(__dirname, '../controller'),
path.join(__dirname, '../generators/controller'),
path.join(__dirname, '../template'),
path.join(__dirname, '../service')
])
Expand All @@ -155,7 +155,7 @@ describe('m', function () {
.withGenerators([ // configure path to subgenerators
path.join(__dirname, '../module'),
path.join(__dirname, '../generators/constant'),
path.join(__dirname, '../controller'),
path.join(__dirname, '../generators/controller'),
path.join(__dirname, '../template'),
path.join(__dirname, '../service')
])
Expand All @@ -179,7 +179,7 @@ describe('m', function () {
.withGenerators([ // configure path to subgenerators
path.join(__dirname, '../module'),
path.join(__dirname, '../generators/constant'),
path.join(__dirname, '../controller'),
path.join(__dirname, '../generators/controller'),
path.join(__dirname, '../template'),
path.join(__dirname, '../service')
])
Expand Down Expand Up @@ -222,7 +222,7 @@ describe('m', function () {
.withGenerators([ // configure path to subgenerators
path.join(__dirname, '../module'),
path.join(__dirname, '../generators/constant'),
path.join(__dirname, '../controller'),
path.join(__dirname, '../generators/controller'),
path.join(__dirname, '../template'),
path.join(__dirname, '../service')
])
Expand All @@ -242,7 +242,7 @@ describe('m', function () {
.withGenerators([ // configure path to subgenerators
path.join(__dirname, '../module'),
path.join(__dirname, '../generators/constant'),
path.join(__dirname, '../controller'),
path.join(__dirname, '../generators/controller'),
path.join(__dirname, '../template'),
path.join(__dirname, '../service')
])
Expand All @@ -262,7 +262,7 @@ describe('m', function () {
.withGenerators([ // configure path to subgenerators
path.join(__dirname, '../module'),
path.join(__dirname, '../generators/constant'),
path.join(__dirname, '../controller'),
path.join(__dirname, '../generators/controller'),
path.join(__dirname, '../template'),
path.join(__dirname, '../service')
])
Expand Down
8 changes: 4 additions & 4 deletions test/controller.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ describe('m:controller', function () {

describe('some', function () {
before(function (done) {
helpers.run(path.join(__dirname, '../controller'))
helpers.run(path.join(__dirname, '../generators/controller'))
.withArguments('some')
.on('end', done);
});
Expand All @@ -33,7 +33,7 @@ describe('m:controller', function () {

describe('someCtrl myModule', function () {
before(function (done) {
helpers.run(path.join(__dirname, '../controller'))
helpers.run(path.join(__dirname, '../generators/controller'))
.withArguments('someCtrl myModule')
.on('end', done);
});
Expand All @@ -55,7 +55,7 @@ describe('m:controller', function () {

describe('someCtrl --template=debug', function () {
before(function (done) {
helpers.run(path.join(__dirname, '../controller'))
helpers.run(path.join(__dirname, '../generators/controller'))
.withArguments('someCtrl')
.withOptions({ template: 'debug' })
.on('end', done);
Expand All @@ -82,7 +82,7 @@ describe('m:controller', function () {

describe('someCtrl myModule --template=debug', function () {
before(function (done) {
helpers.run(path.join(__dirname, '../controller'))
helpers.run(path.join(__dirname, '../generators/controller'))
.withArguments('someCtrl myModule')
.withOptions({ template: 'debug' })
.on('end', done);
Expand Down
14 changes: 7 additions & 7 deletions test/module.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ describe('m:module', function () {
before(function (done) {
helpers.run(path.join(__dirname, '../module'))
.withGenerators([ // configure path to subgenerators
path.join(__dirname, '../controller'),
path.join(__dirname, '../generators/controller'),
path.join(__dirname, '../template'),
path.join(__dirname, '../service'),
path.join(__dirname, '../generators/constant')
Expand All @@ -197,7 +197,7 @@ describe('m:module', function () {
before(function (done) {
helpers.run(path.join(__dirname, '../module'))
.withGenerators([ // configure path to subgenerators
path.join(__dirname, '../controller'),
path.join(__dirname, '../generators/controller'),
path.join(__dirname, '../template'),
path.join(__dirname, '../service'),
path.join(__dirname, '../generators/constant')
Expand All @@ -216,7 +216,7 @@ describe('m:module', function () {
before(function (done) {
helpers.run(path.join(__dirname, '../module'))
.withGenerators([ // configure path to subgenerators
path.join(__dirname, '../controller'),
path.join(__dirname, '../generators/controller'),
path.join(__dirname, '../template'),
path.join(__dirname, '../service'),
path.join(__dirname, '../generators/constant')
Expand Down Expand Up @@ -316,7 +316,7 @@ describe('m:module', function () {
before(function (done) {
helpers.run(path.join(__dirname, '../module'))
.withGenerators([ // configure path to subgenerators
path.join(__dirname, '../controller'),
path.join(__dirname, '../generators/controller'),
path.join(__dirname, '../template'),
path.join(__dirname, '../service'),
path.join(__dirname, '../generators/constant')
Expand All @@ -337,7 +337,7 @@ describe('m:module', function () {
before(function (done) {
helpers.run(path.join(__dirname, '../module'))
.withGenerators([ // configure path to subgenerators
path.join(__dirname, '../controller'),
path.join(__dirname, '../generators/controller'),
path.join(__dirname, '../template'),
path.join(__dirname, '../service'),
path.join(__dirname, '../generators/constant')
Expand Down Expand Up @@ -376,7 +376,7 @@ describe('m:module', function () {
before(function (done) {
helpers.run(path.join(__dirname, '../module'))
.withGenerators([ // configure path to subgenerators
path.join(__dirname, '../controller'),
path.join(__dirname, '../generators/controller'),
path.join(__dirname, '../template'),
path.join(__dirname, '../service'),
path.join(__dirname, '../generators/constant')
Expand All @@ -396,7 +396,7 @@ describe('m:module', function () {
before(function (done) {
helpers.run(path.join(__dirname, '../module'))
.withGenerators([ // configure path to subgenerators
path.join(__dirname, '../controller'),
path.join(__dirname, '../generators/controller'),
path.join(__dirname, '../template'),
path.join(__dirname, '../service'),
path.join(__dirname, '../generators/constant')
Expand Down
2 changes: 1 addition & 1 deletion test/pair.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ describe('M:generators/pair', function () {
before(function (done) {
helpers.run(path.join(__dirname, '../generators/pair'))
.withGenerators([ // configure path to subgenerators
path.join(__dirname, '../controller'),
path.join(__dirname, '../generators/controller'),
path.join(__dirname, '../template'),
])
.withArguments('name')
Expand Down

0 comments on commit 4485416

Please sign in to comment.