From 7ffc7a76f5094f26d35e2accecf0e127db5f1e2b Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Tue, 17 Oct 2017 16:15:53 +0700
Subject: [PATCH] Unify names

---
 .../page_objects/{adminPage.js => admin.js}   |  0
 .../{installPage.js => install.js}            |  0
 .../{01_install_test.js => 01_install.js}     | 34 +++++++++----------
 .../specs/{02_admin_test.js => 02_admin.js}   |  2 +-
 4 files changed, 18 insertions(+), 18 deletions(-)
 rename test/e2e/page_objects/{adminPage.js => admin.js} (100%)
 rename test/e2e/page_objects/{installPage.js => install.js} (100%)
 rename test/e2e/specs/{01_install_test.js => 01_install.js} (74%)
 rename test/e2e/specs/{02_admin_test.js => 02_admin.js} (91%)

diff --git a/test/e2e/page_objects/adminPage.js b/test/e2e/page_objects/admin.js
similarity index 100%
rename from test/e2e/page_objects/adminPage.js
rename to test/e2e/page_objects/admin.js
diff --git a/test/e2e/page_objects/installPage.js b/test/e2e/page_objects/install.js
similarity index 100%
rename from test/e2e/page_objects/installPage.js
rename to test/e2e/page_objects/install.js
diff --git a/test/e2e/specs/01_install_test.js b/test/e2e/specs/01_install.js
similarity index 74%
rename from test/e2e/specs/01_install_test.js
rename to test/e2e/specs/01_install.js
index c2e6b19c9..caafdb4e0 100644
--- a/test/e2e/specs/01_install_test.js
+++ b/test/e2e/specs/01_install.js
@@ -1,47 +1,47 @@
 module.exports = {
   '@tags': ['install'],
   'User goes to install': (client) => {
-    const installPage = client.page.installPage();
+    const install = client.page.install();
 
-    installPage
+    install
       .navigate()
       .ready();
 
   },
   'User clicks get started button': (client) => {
-    const installPage = client.page.installPage();
+    const install = client.page.install();
 
-    installPage
+    install
       .waitForElementVisible('@getStartedButton')
       .click('@getStartedButton');
   },
   'User should see step 2 - Add Organization Name': (client) => {
-    const installPage = client.page.installPage();
+    const install = client.page.install();
 
-    installPage
+    install
       .waitForElementVisible('@step2');
   },
   'User fills step 2': (client) => {
-    const installPage = client.page.installPage();
+    const install = client.page.install();
     const {testData} = client.globals;
 
-    installPage
+    install
       .waitForElementVisible('@step2organizationNameInput')
       .setValue('@step2organizationNameInput', testData.organizationName)
       .waitForElementVisible('@step2saveButton')
       .click('@step2saveButton');
   },
   'User should see step 3 - Create your account': (client) => {
-    const installPage = client.page.installPage();
+    const install = client.page.install();
 
-    installPage
+    install
       .waitForElementVisible('@step3');
   },
   'User fills step 3': (client) => {
-    const installPage = client.page.installPage();
+    const install = client.page.install();
     const {testData: {admin}} = client.globals;
 
-    installPage
+    install
       .setValue('@step3EmailInput', admin.email)
       .setValue('@step3UsernameInput', admin.username)
       .setValue('@step3PasswordInput', admin.password)
@@ -50,21 +50,21 @@ module.exports = {
       .click('@step3saveButton');
   },
   'User should see step 4 - Domain Whitelist': (client) => {
-    const installPage = client.page.installPage();
+    const install = client.page.install();
 
-    installPage
+    install
       .waitForElementVisible('@step4');
   },
   'User fills step 4': (client) => {
-    const installPage = client.page.installPage();
+    const install = client.page.install();
 
-    installPage
+    install
       .waitForElementVisible('@step4DomainInput')
       .setValue('@step4DomainInput', client.launchUrl);
 
     client.keys(client.Keys.ENTER);
 
-    installPage
+    install
       .waitForElementVisible('@step4saveButton')
       .click('@step4saveButton');
   },
diff --git a/test/e2e/specs/02_admin_test.js b/test/e2e/specs/02_admin.js
similarity index 91%
rename from test/e2e/specs/02_admin_test.js
rename to test/e2e/specs/02_admin.js
index b62f6b9e0..10f5fb821 100644
--- a/test/e2e/specs/02_admin_test.js
+++ b/test/e2e/specs/02_admin.js
@@ -1,7 +1,7 @@
 module.exports = {
   '@tags': ['admin', 'login'],
   'Admin logs in': (client) => {
-    const adminPage = client.page.adminPage();
+    const adminPage = client.page.admin();
     const {testData: {admin}} = client.globals;
 
     adminPage