fix(tests): Updated e2e config to include modules tests and fixed register and login tests

Author: pilsy

app/modules/cs_account/tests/e2e/register.test.js

@@ -1,24 +1,25 @@
 // test if the register is working against a running back-end
-xdescribe('e2e: register', function() {
+describe( 'e2e: register', function() {
 
   var ptor;
   beforeEach(function() {
     ptor = protractor.getInstance();
-    ptor.get('/register');
+    ptor.get( '/register' );
   });
 
-  it('should login with the default user account', function() {
-    var email = element(by.model('credentials.username'));
-    var password = element(by.model('credentials.password'));
-    var passwordConfirmation = element(by.model('credentials.passwordConfirmation'));
+  it( 'should login with the default user account', function() {
+    var email = element( by.model( 'credentials.email' ) );
+    var password = element( by.model( 'credentials.password' ) );
+    var passwordConfirmation = element( by.model( 'credentials.passwordConfirmation' ) );
 
-    username.sendKeys('user1234');
-    password.sendKeys('1234');
-    passwordConfirmation.sendKeys('1234');
-    ptor.findElement(protractor.By.css('button[type="submit"]')).click();
+    email.sendKeys( 'user1234@email.com' );
+    password.sendKeys( '1234' );
+    passwordConfirmation.sendKeys( '1234' );
+    
+    ptor.findElement( protractor.By.css( 'button[type="submit"]' ) ).click();
 
-    expect(ptor.findElement(protractor.By.tagName('h1')).getText())
-      .toEqual('Users');
+    expect( ptor.findElement( protractor.By.tagName( 'h1' ) ).getText() )
+      .toEqual( 'Users' );
 
   });
 

app/modules/cs_session/tests/e2e/login.test.js

@@ -1,22 +1,22 @@
 // test if the login is working against a running back-end
-xdescribe('e2e: login', function() {
+describe('e2e: login', function() {
 
   var ptor;
   beforeEach(function() {
     ptor = protractor.getInstance();
-    ptor.get('/login');
+    ptor.get( '/login?redirect=users' );
   });
 
   it('should login with the default user account', function() {
-    var username = element(by.model('credentials.username'));
-    var password = element(by.model('credentials.password'));
+    var username = element( by.model( 'credentials.username' ) );
+    var password = element( by.model( 'credentials.password' ) );
 
-    username.sendKeys('admin');
-    password.sendKeys('1234');
-    ptor.findElement(protractor.By.css('button[type="submit"]')).click();
+    username.sendKeys( 'user1234@email.com' );
+    password.sendKeys( '1234' );
+    ptor.findElement( protractor.By.css( 'button[type="submit"]' ) ).click();
 
-    expect(ptor.findElement(protractor.By.tagName('h1')).getText())
-      .toEqual('Users');
+    expect( ptor.findElement( protractor.By.tagName('h1') ).getText() )
+      .toEqual( 'Users' );
 
   });
 

package.json

@@ -6,7 +6,7 @@
     "email": "admin@cleverstack.io",
     "web": "http://cleverstack.io"
   },
-  "version": "1.1.1",
+  "version": "1.1.2",
   "collaborators": [
     "Richard Gustin <richard@clevertech.biz>",
     "Simon W. Jackson <simon@clevertech.biz>",

test-e2e.conf.js

@@ -41,7 +41,8 @@ exports.config = {
   // Spec patterns are relative to the location of this config.
   specs: [
     './test*/e2e/**/*.js',
-    './**/test*/e2e/**/*.js'
+    './**/test*/e2e/**/*.js',
+    './app/modules/**/test*/e2e/*.js'
   ],
 
   // ----- Capabilities to be passed to the webdriver instance ----