Merge branch 'release/v0.1.2'

es5/lib/app.index.js

@@ -48,14 +48,14 @@ module.exports = yeoman.generators.Base.extend({
 		//copy feature steps
 		["_model.common.steps.js", "_model.show.steps.js", "_model.create.steps.js", "_model.update.steps.js", "_model.delete.steps.js", "_model.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.fs.copyTpl(_this.templatePath("es6/features/steps/" + templatePath), _this.destinationPath("es6/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);
+		this.fs.copyTpl(this.templatePath("es6/spec/fixtures/_modelFixtures.json"), this.destinationPath("es6/spec/fixtures/" + context.names + ".json"), context);
 
 		//copy controller
-		this.fs.copyTpl(this.templatePath("app/controllers/_modelController.js"), this.destinationPath("app/controllers/" + context.name + "Controller.js"), context);
+		this.fs.copyTpl(this.templatePath("es6/app/controllers/_modelController.js"), this.destinationPath("es6/app/controllers/" + context.name + "Controller.js"), context);
 	},
 
 	install: function yoInstall() {

es5/lib/features.index.js

@@ -43,7 +43,7 @@ module.exports = yeoman.generators.Base.extend({
 		//copy features
 		["_model.show.feature", "_model.create.feature", "_model.update.feature", "_model.delete.feature", "_model.list.feature"].forEach(function (templatePath) {
 			var newName = templatePath.replace("_model", "" + context.name);
-			_this.fs.copyTpl(_this.templatePath("features/" + templatePath), _this.destinationPath("features/" + context.name + "/" + newName), context);
+			_this.fs.copyTpl(_this.templatePath("es6/features/" + templatePath), _this.destinationPath("es6/features/" + context.name + "/" + newName), context);
 		}, this);
 	},
 

es5/spec/app.index.spec.js

@@ -16,25 +16,25 @@ describe("troupe", function () {
   });
 
   it("creates step files", function () {
-    assert.file(["features/steps/" + name + "/" + name + ".common.steps.js", "features/steps/" + name + "/" + name + ".show.steps.js", "features/steps/" + name + "/" + name + ".create.steps.js", "features/steps/" + name + "/" + name + ".update.steps.js", "features/steps/" + name + "/" + name + ".delete.steps.js", "features/steps/" + name + "/" + name + ".list.steps.js"]);
+    assert.file(["es6/features/steps/" + name + "/" + name + ".common.steps.js", "es6/features/steps/" + name + "/" + name + ".show.steps.js", "es6/features/steps/" + name + "/" + name + ".create.steps.js", "es6/features/steps/" + name + "/" + name + ".update.steps.js", "es6/features/steps/" + name + "/" + name + ".delete.steps.js", "es6/features/steps/" + name + "/" + name + ".list.steps.js"]);
   });
 
   it("creates the fixture file", function () {
-    assert.file(["spec/fixtures/" + name + "s.json"]);
+    assert.file(["es6/spec/fixtures/" + name + "s.json"]);
   });
 
   it("creates the controller", function () {
-    assert.file(["app/controllers/" + name + "Controller.js"]);
+    assert.file(["es6/app/controllers/" + name + "Controller.js"]);
   });
 
   describe("(about the content of every feature)", function () {
     it("should have some this.querySpy = on it", function () {
-      assert.fileContent([["features/steps/" + name + "/" + name + ".show.steps.js", "this.querySpy ="]]);
+      assert.fileContent([["es6/features/steps/" + name + "/" + name + ".show.steps.js", "this.querySpy ="]]);
     });
 
     describe("(controller content)", function () {
       it("should have filters for validation", function () {
-        assert.fileContent([["app/controllers/" + name + "Controller.js", "filters()"], ["app/controllers/" + name + "Controller.js", "[validateId]"], ["app/controllers/" + name + "Controller.js", "[validateData]"]]);
+        assert.fileContent([["es6/app/controllers/" + name + "Controller.js", "filters()"], ["es6/app/controllers/" + name + "Controller.js", "[validateId]"], ["es6/app/controllers/" + name + "Controller.js", "[validateData]"]]);
       });
     });
   });

es5/spec/features.index.spec.js

@@ -16,6 +16,6 @@ describe("troupe:features", function () {
   });
 
   it("creates feature files", function () {
-    assert.file(["features/" + name + "/" + name + ".show.feature", "features/" + name + "/" + name + ".create.feature", "features/" + name + "/" + name + ".update.feature", "features/" + name + "/" + name + ".delete.feature", "features/" + name + "/" + name + ".list.feature"]);
+    assert.file(["es6/features/" + name + "/" + name + ".show.feature", "es6/features/" + name + "/" + name + ".create.feature", "es6/features/" + name + "/" + name + ".update.feature", "es6/features/" + name + "/" + name + ".delete.feature", "es6/features/" + name + "/" + name + ".list.feature"]);
   });
 });

es6/lib/app.index.js

@@ -49,23 +49,23 @@ module.exports = yeoman.generators.Base.extend({
 		.forEach((templatePath) => {
 			let newName = templatePath.replace("_model", `${context.name}`);
 			this.fs.copyTpl(
-				this.templatePath("features/steps/" + templatePath),
-				this.destinationPath(`features/steps/${context.name}/${newName}`),
+				this.templatePath("es6/features/steps/" + templatePath),
+				this.destinationPath(`es6/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`),
+			this.templatePath("es6/spec/fixtures/_modelFixtures.json"),
+			this.destinationPath(`es6/spec/fixtures/${context.names}.json`),
 			context
 		);
 
 		//copy controller
 		this.fs.copyTpl(
-			this.templatePath("app/controllers/_modelController.js"),
-			this.destinationPath(`app/controllers/${context.name}Controller.js`),
+			this.templatePath("es6/app/controllers/_modelController.js"),
+			this.destinationPath(`es6/app/controllers/${context.name}Controller.js`),
 			context
 		);
 	},

es6/lib/features.index.js

@@ -41,8 +41,8 @@ module.exports = yeoman.generators.Base.extend({
 		.forEach((templatePath) => {
 			let newName = templatePath.replace("_model", `${context.name}`);
 			this.fs.copyTpl(
-				this.templatePath("features/" + templatePath),
-				this.destinationPath(`features/${context.name}/${newName}`),
+				this.templatePath("es6/features/" + templatePath),
+				this.destinationPath(`es6/features/${context.name}/${newName}`),
 				context
 			);
 		}, this);

es6/spec/app.index.spec.js

@@ -19,38 +19,38 @@ describe("troupe", () => {
 
   it("creates step files", () => {
     assert.file([
-      `features/steps/${name}/${name}.common.steps.js`,
-      `features/steps/${name}/${name}.show.steps.js`,
-      `features/steps/${name}/${name}.create.steps.js`,
-      `features/steps/${name}/${name}.update.steps.js`,
-      `features/steps/${name}/${name}.delete.steps.js`,
-      `features/steps/${name}/${name}.list.steps.js`
+      `es6/features/steps/${name}/${name}.common.steps.js`,
+      `es6/features/steps/${name}/${name}.show.steps.js`,
+      `es6/features/steps/${name}/${name}.create.steps.js`,
+      `es6/features/steps/${name}/${name}.update.steps.js`,
+      `es6/features/steps/${name}/${name}.delete.steps.js`,
+      `es6/features/steps/${name}/${name}.list.steps.js`
     ]);
   });
 
   it("creates the fixture file", () => {
     assert.file([
-      `spec/fixtures/${name}s.json`
+      `es6/spec/fixtures/${name}s.json`
     ]);
   });
 
   it("creates the controller", () => {
     assert.file([
-      `app/controllers/${name}Controller.js`
+      `es6/app/controllers/${name}Controller.js`
     ]);
   });
 
   describe("(about the content of every feature)", () => {
     it("should have some this.querySpy = on it", () => {
-      assert.fileContent([[`features/steps/${name}/${name}.show.steps.js`, "this.querySpy ="]]);
+      assert.fileContent([[`es6/features/steps/${name}/${name}.show.steps.js`, "this.querySpy ="]]);
     });
 
     describe("(controller content)", () => {
         it("should have filters for validation", () => {
             assert.fileContent([
-                    [`app/controllers/${name}Controller.js`, "filters()"],
-                    [`app/controllers/${name}Controller.js`, "[validateId]"],
-                    [`app/controllers/${name}Controller.js`, "[validateData]"]
+                    [`es6/app/controllers/${name}Controller.js`, "filters()"],
+                    [`es6/app/controllers/${name}Controller.js`, "[validateId]"],
+                    [`es6/app/controllers/${name}Controller.js`, "[validateData]"]
                 ]);
         });
     });

es6/spec/features.index.spec.js

@@ -19,11 +19,11 @@ describe("troupe:features", () => {
 
   it("creates feature files", () => {
     assert.file([
-      `features/${name}/${name}.show.feature`,
-      `features/${name}/${name}.create.feature`,
-      `features/${name}/${name}.update.feature`,
-      `features/${name}/${name}.delete.feature`,
-      `features/${name}/${name}.list.feature`
+      `es6/features/${name}/${name}.show.feature`,
+      `es6/features/${name}/${name}.create.feature`,
+      `es6/features/${name}/${name}.update.feature`,
+      `es6/features/${name}/${name}.delete.feature`,
+      `es6/features/${name}/${name}.list.feature`
     ]);
   });
 });

generators/app/templates/features/steps/_model.update.steps.js → generators/app/templates/es6/features/steps/_model.update.steps.js

@@ -25,19 +25,21 @@ export default function <%= Name %>ControllerUpdateSteps () {
 			this.<%= name %> = {};
 		}
 
-		if(this.<%= name %>.name) {
-			this.<%= name %>.name = "newName";
+		let entityToUpdate = {};
+		if(this.itemList.name) {
+			entityToUpdate = Object.assign(entityToUpdate, this.itemList);
+			entityToUpdate.name = "newName";
 		}
 
 		//TODO ADD MOCKS WITH ATTRIBUTES
-		this.querySpy = this.database.spy(/update `<%= _name %>s` set `title` = 'newName', `updated_at` = '[0-9\:\- \.]*' where `id` = 1/, [1]);
+		this.querySpy = this.database.spy(/update `<%= _name %>s` set `name` = 'newName', `updated_at` = '[0-9\:\- \.]*' where `id` = 1/, [1]);
 
 		Request
 			.put
 			.url(this.url + "/<%= name %>/" + this.<%= name %>Id)
 			.header("Content-Type", "application/vnd.api+json")
 			.header("Client-Access-Token", this.clientAccessToken)
-			.data({data: this.<%= name %>})
+			.data({data: entityToUpdate})
 			.results((error, response) => {
 				this.response = response;
 				callback();

package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-troupe",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Generator for FAM troupe.",
   "main": "index.js",
   "scripts": {

tasks/test-local.js

@@ -1,6 +1,5 @@
 import gulp from "gulp";
 import mocha from "gulp-mocha";
-import "superstack";
 import istanbul from "gulp-istanbul";
 import paths from "../paths.json";