The refactoring for authentication.features for cucumber 0.14 done

Author: mstamos

tests/cucumber/features/authentication/authentication.feature

@@ -8,21 +8,21 @@ Feature: Allow user to login and logout
   Background:
     Given I am signed out
 
-  @rerun
+  @dev
   Scenario: A user can login with valid information
     Given I am on the home page
     When  I click on sign in link
     And   I enter my authentication information
     Then  I should be logged in
 
-  @rerun
+  @dev
   Scenario: A user cannot login with invalid information
     Given I am on the home page
     When  I click on sign in link
     And   I enter my false authentication information
     Then  I should see a user not found error
 
-  @rerun
+  @dev
   Scenario: A user cannot login with invalid email address
     Given I am on the home page
     When  I click on sign in link

tests/cucumber/features/authentication/authentication.js

@@ -20,83 +20,82 @@
          */
 
         this.Given(/^I am signed out$/, function () {
-            var client = this.client;
-            browser.url(process.env.ROOT_URL);
-            browser.waitForExist(".container");
-            browser.waitForVisible(".container");
-            browser.waitForVisible("#login-sign-in-link");
+            client.url(process.env.ROOT_URL);
+            client.waitForExist(".container");
+            client.waitForVisible(".container");
+            client.waitForVisible("#login-sign-in-link");
 
-            actual = browser.getText("#login-sign-in-link");
+            actual = client.getText("#login-sign-in-link");
             expected = "Sign in";
 
             expect(actual).toContain(expected);
         });
 
         this.Given(/^I am on the home page$/, function () {
-            return this.client.
                 // We navigate into home page
-                url(process.env.ROOT_URL);
+                client.url(process.env.ROOT_URL);
         });
 
         this.When(/^I click on sign in link$/, function () {
-            // Wait
-            var client = this.client;
             // We navigate into home page
             client.url(process.env.ROOT_URL);
 
             // Wait for the page to load
             client.waitForExist(".container", 1000);
-            client.waitForVisible(".container", 1000)
-
+            client.waitForVisible(".container", 1000);
             // We click the login button
             client.click("#login-sign-in-link");
         });
 
-        this.When(/^I enter my authentication information$/, function (callback) {
-            return loginWithCredentials(browser, myEmail, wrongPass);
+        this.When(/^I enter my authentication information$/, function () {
+            return loginWithCredentials(browser, myEmail, myPass)
         });
 
-        this.Then(/^I should be logged in$/, function (callback) {
-            return this.client.
-                //We wait if our email address will appear instead of Sign in
-                waitForExist("#login-name-link", 500).
-                getText("#login-name-link", function (error, email) {
-                    return chai.expect(email).to.contain(myEmail);
-                });
+        this.Then(/^I should be logged in$/, function () {
+
+            //We wait if our email address will appear instead of Sign in
+            client.waitForExist("#login-name-link");
+
+            actual = client.getText("#login-name-link");
+            expected = myEmail;
+            expect(actual).toContain(expected);
+
         });
 
         /**
          * Scenario: A user cannot login with invalid information
          */
 
         this.When(/^I enter my false authentication information$/, function () {
-            return loginWithCredentials(browser, myEmail, wrongPass);
+            return loginWithCredentials(browser, wrongEmail, wrongPass);
         });
 
         this.Then(/^I should see a user not found error$/, function () {
             // We wait the User not found message to appear
-            return this.client.
-                waitForExist(".error-message").
-                getText(".error-message", function (error, message) {
-                    return chai.expect(message).to.contain("User not found");
-                });
+            client.waitForExist(".error-message");
+
+            actual = client.getText(".error-message");
+            expected = "User not found";
+            expect(actual).toContain(expected);
+
         });
 
         /**
          * Scenario: A user cannot login with invalid email address
          */
 
-        this.When(/^I enter my invalid email address$/, function (callback) {
-            return loginWithCredentials(browser, myEmail, wrongPass);
+        this.When(/^I enter my invalid email address$/, function () {
+            return loginWithCredentials(client, invalidWord, wrongPass);
         });
 
-        this.Then(/^I should see an invalid email error message$/, function (callback) {
+        this.Then(/^I should see an invalid email error message$/, function () {
             // We wait the Invalid email message to appear
-            return this.client.
-                waitForExist(".error-message").
-                getText(".error-message", function (error, message) {
-                    return chai.expect(message).to.contain("Invalid email");
-                });
+            client.waitForExist(".error-message");
+
+            actual = client.getText(".error-message");
+            expected = "Invalid email";
+            expect(actual).toContain(expected);
+
         });
 
         /**
@@ -105,13 +104,14 @@
 
         this.When(/^I enter my invalid password$/, function () {
             // We enter into sign in fields wrong information
-            return loginWithCredentials(browser, myEmail, wrongPass);
+            return loginWithCredentials(client, myEmail, wrongPass);
         });
 
         this.Then(/^I should see an incorrect password error message$/, function () {
             // We wait the Incorrect password message to appear
-            browser.waitForExist(".error-message");
-            actual = browser.getText(".error-message");
+            client.waitForExist(".error-message");
+
+            actual = client.getText(".error-message");
             expected = "Incorrect password";
             expect(actual).toBe(expected);
         });
@@ -124,13 +124,13 @@
      * @param pass
      * @return {*|{phasedRegistrationNames}}
      */
-    function loginWithCredentials(browser, email, pass) {
-        browser.waitForExist("#login-email");
+    function loginWithCredentials(client, email, pass) {
+        client.waitForExist("#login-email");
         // We set the values into email and password
-        browser.setValue("#login-email", email);
-        browser.setValue("#login-password", pass);
+        client.setValue("#login-email", email);
+        client.setValue("#login-password", pass);
 
         // We click the Sign In button
-        browser.click('#login-buttons-password')
+        client.click('#login-buttons-password')
     }
 })();

tests/cucumber/features/support/hooks.js

@@ -3,11 +3,11 @@
     'use strict';
 
     module.exports = function () {
-        this.Before(function (callback) {
+        this.Before(function () {
             // This code runs before every scenario
-            this.server.call("removePosts");
-            this.server.call("addInitialPosts");
-            this.server.call('addUser', {email: "miltos@example.com"});
+            server.call("removePosts");
+            server.call("addInitialPosts");
+            server.call('addUser', {email: "miltos@example.com"});
         });
     };