Skip to content

Commit

Permalink
moving steps back to controller
Browse files Browse the repository at this point in the history
  • Loading branch information
@dcrockwell
dcrockwell committed Jul 6, 2015
1 parent 63bf6ed commit 2ff03b8
Show file tree
Hide file tree
Showing 14 changed files with 37 additions and 97 deletions.
37 changes: 7 additions & 30 deletions es5/lib/app.index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,43 +36,20 @@ module.exports = yeoman.generators.Base.extend({
},

writing: function yoWriting() {
var _this = this;

var context = {
name: this.props.name,
Name: (0, _jargon2["default"])(this.props.name).pascal.toString(),
names: (0, _jargon2["default"])(this.props.name).plural.toString(),
_name: (0, _jargon2["default"])(this.props.name).snake.toString()
};

// //copy feature steps
// ["_modelController.common.steps.js",
// "_modelController.show.steps.js",
// "_modelController.create.steps.js",
// "_modelController.update.steps.js",
// "_modelController.delete.steps.js",
// "_modelController.list.steps.js"]
// .forEach((templatePath) => {
// let newName = templatePath.replace("_model", `${context.name}`);
// this.fs.copyTpl(
// this.templatePath("features/steps/" + templatePath),
// this.destinationPath(`features/steps/${context.name}/${newName}`),
// context
// );
// }, this);
//
// //copy features
// ["_modelController.show.feature",
// "_modelController.create.feature",
// "_modelController.update.feature",
// "_modelController.delete.feature",
// "_modelController.list.feature"]
// .forEach((templatePath) => {
// let newName = templatePath.replace("_model", `${context.name}`);
// this.fs.copyTpl(
// this.templatePath("features/" + templatePath),
// this.destinationPath(`features/${context.name}/${newName}`),
// context
// );
// }, this);
//copy feature steps
["_modelController.common.steps.js", "_modelController.show.steps.js", "_modelController.create.steps.js", "_modelController.update.steps.js", "_modelController.delete.steps.js", "_modelController.list.steps.js"].forEach(function (templatePath) {
var newName = templatePath.replace("_model", "" + context.name);
_this.fs.copyTpl(_this.templatePath("features/steps/" + templatePath), _this.destinationPath("features/steps/" + context.name + "/" + newName), context);
}, this);

//copy fixtures
this.fs.copyTpl(this.templatePath("spec/fixtures/_modelFixtures.json"), this.destinationPath("spec/fixtures/" + context.names + ".json"), context);
Expand Down
6 changes: 0 additions & 6 deletions es5/lib/features.index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,6 @@ module.exports = yeoman.generators.Base.extend({
_name: (0, _jargon2["default"])(this.props.name).snake.toString()
};

//copy feature steps
["_modelController.common.steps.js", "_modelController.show.steps.js", "_modelController.create.steps.js", "_modelController.update.steps.js", "_modelController.delete.steps.js", "_modelController.list.steps.js"].forEach(function (templatePath) {
var newName = templatePath.replace("_model", "" + context.name);
_this.fs.copyTpl(_this.templatePath("features/steps/" + templatePath), _this.destinationPath("features/steps/" + context.name + "/" + newName), context);
}, this);

//copy features
["_modelController.show.feature", "_modelController.create.feature", "_modelController.update.feature", "_modelController.delete.feature", "_modelController.list.feature"].forEach(function (templatePath) {
var newName = templatePath.replace("_model", "" + context.name);
Expand Down
4 changes: 4 additions & 0 deletions es5/spec/app.index.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ describe("forbin-scudl", function () {
}).on("end", done);
});

it("creates step files", function () {
assert.file(["features/steps/" + name + "/" + name + "Controller.common.steps.js", "features/steps/" + name + "/" + name + "Controller.show.steps.js", "features/steps/" + name + "/" + name + "Controller.create.steps.js", "features/steps/" + name + "/" + name + "Controller.update.steps.js", "features/steps/" + name + "/" + name + "Controller.delete.steps.js", "features/steps/" + name + "/" + name + "Controller.list.steps.js"]);
});

it("creates the fixture file", function () {
assert.file(["spec/fixtures/" + name + "s.json"]);
});
Expand Down
4 changes: 0 additions & 4 deletions es5/spec/features.index.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@ describe("forbin-scudl:features", function () {
}).on("end", done);
});

it("creates step files", function () {
assert.file(["features/steps/" + name + "/" + name + "Controller.common.steps.js", "features/steps/" + name + "/" + name + "Controller.show.steps.js", "features/steps/" + name + "/" + name + "Controller.create.steps.js", "features/steps/" + name + "/" + name + "Controller.update.steps.js", "features/steps/" + name + "/" + name + "Controller.delete.steps.js", "features/steps/" + name + "/" + name + "Controller.list.steps.js"]);
});

it("creates feature files", function () {
assert.file(["features/" + name + "/" + name + "Controller.show.feature", "features/" + name + "/" + name + "Controller.create.feature", "features/" + name + "/" + name + "Controller.update.feature", "features/" + name + "/" + name + "Controller.delete.feature", "features/" + name + "/" + name + "Controller.list.feature"]);
});
Expand Down
45 changes: 15 additions & 30 deletions es6/lib/app.index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,36 +39,21 @@ module.exports = yeoman.generators.Base.extend({
_name: inflect(this.props.name).snake.toString()
};

// //copy feature steps
// ["_modelController.common.steps.js",
// "_modelController.show.steps.js",
// "_modelController.create.steps.js",
// "_modelController.update.steps.js",
// "_modelController.delete.steps.js",
// "_modelController.list.steps.js"]
// .forEach((templatePath) => {
// let newName = templatePath.replace("_model", `${context.name}`);
// this.fs.copyTpl(
// this.templatePath("features/steps/" + templatePath),
// this.destinationPath(`features/steps/${context.name}/${newName}`),
// context
// );
// }, this);
//
// //copy features
// ["_modelController.show.feature",
// "_modelController.create.feature",
// "_modelController.update.feature",
// "_modelController.delete.feature",
// "_modelController.list.feature"]
// .forEach((templatePath) => {
// let newName = templatePath.replace("_model", `${context.name}`);
// this.fs.copyTpl(
// this.templatePath("features/" + templatePath),
// this.destinationPath(`features/${context.name}/${newName}`),
// context
// );
// }, this);
//copy feature steps
["_modelController.common.steps.js",
"_modelController.show.steps.js",
"_modelController.create.steps.js",
"_modelController.update.steps.js",
"_modelController.delete.steps.js",
"_modelController.list.steps.js"]
.forEach((templatePath) => {
let newName = templatePath.replace("_model", `${context.name}`);
this.fs.copyTpl(
this.templatePath("features/steps/" + templatePath),
this.destinationPath(`features/steps/${context.name}/${newName}`),
context
);
}, this);

//copy fixtures
this.fs.copyTpl(
Expand Down
16 changes: 0 additions & 16 deletions es6/lib/features.index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,22 +32,6 @@ module.exports = yeoman.generators.Base.extend({
_name: inflect(this.props.name).snake.toString()
};

//copy feature steps
["_modelController.common.steps.js",
"_modelController.show.steps.js",
"_modelController.create.steps.js",
"_modelController.update.steps.js",
"_modelController.delete.steps.js",
"_modelController.list.steps.js"]
.forEach((templatePath) => {
let newName = templatePath.replace("_model", `${context.name}`);
this.fs.copyTpl(
this.templatePath("features/steps/" + templatePath),
this.destinationPath(`features/steps/${context.name}/${newName}`),
context
);
}, this);

//copy features
["_modelController.show.feature",
"_modelController.create.feature",
Expand Down
11 changes: 11 additions & 0 deletions es6/spec/app.index.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,17 @@ describe("forbin-scudl", () => {
.on("end", done);
});

it("creates step files", () => {
assert.file([
`features/steps/${name}/${name}Controller.common.steps.js`,
`features/steps/${name}/${name}Controller.show.steps.js`,
`features/steps/${name}/${name}Controller.create.steps.js`,
`features/steps/${name}/${name}Controller.update.steps.js`,
`features/steps/${name}/${name}Controller.delete.steps.js`,
`features/steps/${name}/${name}Controller.list.steps.js`
]);
});

it("creates the fixture file", () => {
assert.file([
`spec/fixtures/${name}s.json`
Expand Down
11 changes: 0 additions & 11 deletions es6/spec/features.index.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,6 @@ describe("forbin-scudl:features", () => {
.on("end", done);
});

it("creates step files", () => {
assert.file([
`features/steps/${name}/${name}Controller.common.steps.js`,
`features/steps/${name}/${name}Controller.show.steps.js`,
`features/steps/${name}/${name}Controller.create.steps.js`,
`features/steps/${name}/${name}Controller.update.steps.js`,
`features/steps/${name}/${name}Controller.delete.steps.js`,
`features/steps/${name}/${name}Controller.list.steps.js`
]);
});

it("creates feature files", () => {
assert.file([
`features/${name}/${name}Controller.show.feature`,
Expand Down
0 ...es/steps/_modelController.common.steps.js → ...es/steps/_modelController.common.steps.js
View file
File renamed without changes.
0 ...es/steps/_modelController.create.steps.js → ...es/steps/_modelController.create.steps.js
View file
File renamed without changes.
0 ...es/steps/_modelController.delete.steps.js → ...es/steps/_modelController.delete.steps.js
View file
File renamed without changes.
0 ...ures/steps/_modelController.list.steps.js → ...ures/steps/_modelController.list.steps.js
View file
File renamed without changes.
0 ...ures/steps/_modelController.show.steps.js → ...ures/steps/_modelController.show.steps.js
View file
File renamed without changes.
0 ...es/steps/_modelController.update.steps.js → ...es/steps/_modelController.update.steps.js
View file
File renamed without changes.

0 comments on commit 2ff03b8

Please sign in to comment.