Merge branch 'master' into 'master'

Master(efernandez) See merge request !33

Merge branch 'master' into 'master'
Master(efernandez) See merge request !33
Jose Pinto
2 parents 556f72f8d4 ae81b7a66e
Showing 3 changed files Show diff stats
gulpfile.js
package.json
spec/serviceSpec.js
@@ -61,7 +61,7 @@ gulp.task(&#39;uglify-spec&#39;, function() {
         footer("});"),
         gulp.dest(paths.dist)
     ]);
-})
+});
  
 gulp.task('clean', function() {
     return gulp.src(['tmp', 'dist'], {read: false})
@@ -4,7 +4,7 @@
     "description": "Abm de vehiculo",
     "main": "index.html",
     "scripts": {
-        "test": "echo \"Error: no test specified\" && exit 1",
+        "test": "test.html",
         "compile": "gulp uglify",
         "gulp-pre-commit": "gulp pre-commit",
         "postinstall": "npm run compile && gulp clean-post-install",
@@ -96,7 +96,7 @@ describe(&#39;Servicios de abm vehículo&#39;, function() {
             var returnFake = { data: 'test' };
             var paramFake = 1;
             var result;
-            httpBackend.expectDELETE('localhost/vehiculo/' +paramFake).respond(returnFake);
+            httpBackend.expectDELETE('localhost/vehiculo/' + paramFake).respond(returnFake);
  
             //act
             servicio.deleteVehiculo(paramFake).then(function(data) {
...	...	@@ -61,7 +61,7 @@ gulp.task('uglify-spec', function() {
61	61	footer("});"),
62	62	gulp.dest(paths.dist)
63	63	]);
64		-})
	64	+});
65	65
66	66	gulp.task('clean', function() {
67	67	return gulp.src(['tmp', 'dist'], {read: false})
...	...	@@ -4,7 +4,7 @@
4	4	"description": "Abm de vehiculo",
5	5	"main": "index.html",
6	6	"scripts": {
7		- "test": "echo \"Error: no test specified\" && exit 1",
	7	+ "test": "test.html",
8	8	"compile": "gulp uglify",
9	9	"gulp-pre-commit": "gulp pre-commit",
10	10	"postinstall": "npm run compile && gulp clean-post-install",
...	...	@@ -96,7 +96,7 @@ describe('Servicios de abm vehículo', function() {
96	96	var returnFake = { data: 'test' };
97	97	var paramFake = 1;
98	98	var result;
99		- httpBackend.expectDELETE('localhost/vehiculo/' +paramFake).respond(returnFake);
	99	+ httpBackend.expectDELETE('localhost/vehiculo/' + paramFake).respond(returnFake);
100	100
101	101	//act
102	102	servicio.deleteVehiculo(paramFake).then(function(data) {