From 316971302bef4964b74353c002849f57d0017b65 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Fri, 13 Oct 2017 21:07:39 -0300
Subject: [PATCH] Using testData from Install

---
 test/e2e/page_objects/adminPage.js   | 14 ++++++++++++++
 test/e2e/page_objects/installPage.js |  2 +-
 test/e2e/specs/01_install_test.js    | 22 ++++++----------------
 3 files changed, 21 insertions(+), 17 deletions(-)
 create mode 100644 test/e2e/page_objects/adminPage.js

diff --git a/test/e2e/page_objects/adminPage.js b/test/e2e/page_objects/adminPage.js
new file mode 100644
index 000000000..e3a3ce795
--- /dev/null
+++ b/test/e2e/page_objects/adminPage.js
@@ -0,0 +1,14 @@
+module.exports = {
+  commands: [{
+    url: function() {
+      return `${this.api.launchUrl}/admin`;
+    },
+    ready() {
+      return this
+        .waitForElementVisible('body', 2000);
+    },
+  }],
+  elements: {
+    'loginLayout': '.talk-admin-login'
+  }
+};
diff --git a/test/e2e/page_objects/installPage.js b/test/e2e/page_objects/installPage.js
index 7abf619d6..a81a17347 100644
--- a/test/e2e/page_objects/installPage.js
+++ b/test/e2e/page_objects/installPage.js
@@ -6,7 +6,7 @@ module.exports = {
     ready() {
       return this
         .waitForElementVisible('body', 2000);
-    },
+    }
   }],
   elements: {
     'getStartedButton': '.talk-install-get-started-button',
diff --git a/test/e2e/specs/01_install_test.js b/test/e2e/specs/01_install_test.js
index a5742b8e1..c03b6cc5d 100644
--- a/test/e2e/specs/01_install_test.js
+++ b/test/e2e/specs/01_install_test.js
@@ -1,16 +1,3 @@
-const uuid = require('uuid');
-const {murmur3} = require('murmurhash-js');
-
-const rHash = murmur3(uuid.v4());
-
-const testData = {
-  organizationName: 'Coral',
-  email: `test_${rHash}@test.test`,
-  username: `test${rHash}`,
-  password: `testpassword${rHash}`,
-  domain: 'http://localhost:3000'
-};
-
 module.exports = {
   '@tags': ['install'],
   'User goes to install': (client) => {
@@ -36,7 +23,8 @@ module.exports = {
   },
   'User fills step 2': (client) => {
     const installPage = client.page.installPage();
-    
+    const {testData} = client.globals;
+
     installPage
       .waitForElementVisible('@step2organizationNameInput')
       .setValue('@step2organizationNameInput', testData.organizationName)
@@ -51,7 +39,8 @@ module.exports = {
   },
   'User fills step 3': (client) => {
     const installPage = client.page.installPage();
-    
+    const {testData} = client.globals;
+
     installPage
       .setValue('@step3EmailInput', testData.email)
       .setValue('@step3UsernameInput', testData.username)
@@ -68,7 +57,8 @@ module.exports = {
   },
   'User fills step 4': (client) => {
     const installPage = client.page.installPage();
-    
+    const testData = client.page.getTestData();
+
     installPage
       .waitForElementVisible('@step4DomainInput')
       .setValue('@step4DomainInput', testData.domain);