Added gulp + routes

Gruntfile.js

@@ -57,10 +57,7 @@ module.exports = function (grunt) {
 				files: ['test/spec/{,**/}*.{coffee,litcoffee,coffee.md}'],
 				tasks: ['coffee:test', 'newer:coffee:test', 'karma:unit']
 			},
-			coffeeProtractorTest: {
-				files: ['test/protractor/{,**/}*.{coffee,litcoffee,coffee.md}'],
-				tasks: ['coffee:test', 'newer:coffee:test', 'protractor']
-			},
+
 			compass: {
 				files: ['<%= yeoman.app %>/styles/{,*/}*.{scss,sass}'],
 				tasks: ['compass:server', 'autoprefixer']

app/scripts/services/cmsauthservice.coffee

@@ -21,13 +21,19 @@ angular.module('angularCmsApp').service 'cmsAuthService', ($q, $http, $log, $roo
 		authorize - I handle authorizing a user.
 		###
 		authorize: (user) ->
-			return $http.post( @endpoint+"/users/login", user )
+			return $http.post( @endpoint+"/login", user )
+
+		###*
+		session - I handle getting a session.
+		###
+		session: () ->
+			return $http.get( @endpoint+"/session" )
 
 		###*
 			register - I handle register a user.
 		###
 		register: (user) ->
-			return $http.post( @endpoint+"/users/register", user )
+			return $http.post( @endpoint+"/register", user )
 
 		###*
 			Logout method to clear the session.

gulpfile.js

@@ -5,14 +5,21 @@ coffee = require( 'gulp-coffee' );
 uglify = require( 'gulp-uglify' );
 
 gulp.task( 'js', function () {
-	return gulp
+	gulp
 		.src( './app/scripts/**/*.coffee' )
 		.pipe( coffee() )
 		.pipe( uglify() )
 		.pipe( gulp.dest( './.tmp/scripts' ) );
 } );
+gulp.task( 'js:test', function () {
+	gulp
+		.src( './test/**/*.coffee' )
+		.pipe( coffee() )
+		.pipe( uglify() )
+		.pipe( gulp.dest( './.tmp' ) );
+} );
 
 gulp.task( 'watch', function () {
-	return gulp
-		.watch( './app/scripts/**/*.coffee', ['js'] );
+	gulp.watch( './app/scripts/**/*.coffee', ['js'] );
+	gulp.watch( './test/**/*.coffee', ['js:test'] )
 } );

package.json

@@ -97,6 +97,7 @@
     "grunt-svgmin": "~0.2.0",
     "grunt-usemin": "~2.0.2",
     "gulp-ngmin": "^0.3.0",
+    "gulp-uglify": "^1.0.2",
     "jasmine-core": "^2.1.2",
     "jasmine-node": "~1.11.0",
     "jasmine-reporters": "^1.0.1",

protractor.conf.js

@@ -30,8 +30,8 @@ exports.config = {
   // Spec patterns are relative to the current working directly when
   // protractor is called.
   specs: [
-	  '.tmp/protractor/*-spec.js',
-	  'test/protractor/*-spec.js'
+	  '.tmp/protractor/**/*-spec.js',
+	  'test/protractor/**/*-spec.js'
   ],
 
   // Options to be passed to Jasmine-node.

routes/cms-auth.js

@@ -43,13 +43,18 @@ module.exports = function (config, app) {
 				if (err) {
 					res.jsonp( 400, err );
 				}
-				if (data && bcrypt.compareSync(req.body.password, data.password)) {
-					res.jsonp( 200, data );
-				} else {
-					res.jsonp( 404, {message: 'Wrong username/password!'} );
+
+				try {
+					if (data && bcrypt.compareSync(req.body.password, data.password)) {
+						req.session.user = data;
+						res.jsonp( 200, data );
+					} else {
+						res.jsonp( 404, {message: 'Wrong username/password!'} );
+					}
+				} catch (error) {
+					res.jsonp( 404, {message: error} );
 				}
 			} );
-
 		},
 		/**
 		 * Handle registering a new user
@@ -99,6 +104,12 @@ module.exports = function (config, app) {
 			} );
 		},
 		session: function (req, res, next) {
+			var user = req.session;
+			if(req.session && req.session.user){
+				user = req.session.user
+			}
+			console.warn(util.inspect(user, {colors: true}));
+			res.send({message: 'Your session', data: user});
 		}
 	};
 
@@ -108,7 +119,8 @@ module.exports = function (config, app) {
 		resave: true,
 		saveUninitialized: true
 	} ) );
-	app.post( config.apiBase + '/users/login', bodyParser.json(), cmsAuth.login );
-	app.post( config.apiBase + '/users/register', bodyParser.json(), cmsAuth.register );
-	app.post( config.apiBase + '/users/session', bodyParser.json(), cmsAuth.session );
+	app.get( config.apiBase + '/login', bodyParser.json(), cmsAuth.login );
+	app.post( config.apiBase + '/login', bodyParser.json(), cmsAuth.login );
+	app.post( config.apiBase + '/register', bodyParser.json(), cmsAuth.register );
+	app.get( config.apiBase + '/session', bodyParser.json(), cmsAuth.session );
 };

test/protractor/spec/app-spec.coffee

@@ -0,0 +1,15 @@
+AppPage = require('../pages/app-page')
+
+
+###*
+Protractor e2e Tests
+###
+App = new AppPage()
+describe "Angular-CMS App", ->
+  beforeEach ->
+    App.get()
+
+	#Welome Story: the initial page
+	describe 'Index:', ->
+		it "should display the main index view as default", ->
+			expect(browser.getLocationAbsUrl()).toEqual '/'

test/protractor/spec/login-spec.coffee

@@ -0,0 +1,24 @@
+LoginPage = require('../pages/login-page')
+loginPage = new LoginPage()
+###*
+ Login - The user login implementation
+###
+describe 'Login:', ->
+
+  #Click the login button each time
+  beforeEach ->
+    $('a[href="#/login"]').click()
+
+  #Make sure we end up at the login page to enter our credentials
+  #Make sure there is a username and password input with button
+  it 'should have Username and password inputs with a button to submit the form', ->
+    expect(browser.getLocationAbsUrl()).toEqual '/login'
+
+    #Login to the page
+    loginPage.login('[email protected]', 'test')
+
+    #Wait for the api call to go thru
+    sleep 1
+
+    #We should end up at the dashboard page.
+    expect(browser.getLocationAbsUrl()).toEqual '/dashboard'

test/protractor/spec/register-spec.coffee

@@ -0,0 +1,16 @@
+RegisterPage = require('../pages/register-page')
+j$ = require('../j$')
+
+###*
+Register - The user registration implementation
+###
+describe 'Register: ', ->
+  it 'should have email and password inputs with a button to submit the form', ->
+    registerPage = new RegisterPage()
+    registerPage.get()
+    expect(browser.getCurrentUrl()).toContain 'register'
+    expect(j$.element('form', 'Login form').count()).toEqual 1
+    expect(j$.element('input[name="email"]', 'Email input').count()).toEqual 1
+    expect(j$.element('input[name="username"]', 'Username input').count()).toEqual 1
+    expect(j$.element('input[name="password"]', 'Password input').count()).toEqual 2
+    expect(j$.element('button[type="submit"]', 'Submit button').count()).toEqual 1

test/routes/rest-spec.js

@@ -35,7 +35,7 @@ describe('Testing: API Server', function () {
 
 	it('POST - /api/v2/users/register - should return user on successful registation', function (done) {
 		request(app)
-			.post('/api/v2/users/register')
+			.post('/api/v2/register')
 			.send(postData)
 			.expect("Content-Type", /json/)
 			.expect(201, done);
@@ -47,7 +47,7 @@ describe('Testing: API Server', function () {
 			password: 'test'
 		};
 		request(app)
-			.post('/api/v2/users/login')
+			.post('/api/v2/login')
 			.send(validUser)
 			.expect("Content-Type", /json/)
 			.expect(200, done);
@@ -58,7 +58,7 @@ describe('Testing: API Server', function () {
 			password: 'wrongpassword'
 		};
 		request(app)
-			.post('/api/v2/users/login')
+			.post('/api/v2/login')
 			.send(invalidUser)
 			.expect("Content-Type", /json/)
 			.expect(404, done);