Cleanup scripts and improve the pageobjects

snapcore · Nov 17, 2016 · b83b5aa · b83b5aa
1 parent cb4b6bf
commit b83b5aa
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 22 deletions.
diff --git a/build.sh b/build.sh
@@ -6,7 +6,7 @@
 #   [arch ...]: The architectures to build for. By default it will build for
 #               amd64, arm64, armhf and i386.
 
-set -xe
+set -e
 
 if [ "$#" -eq 0 ]; then
     architectures=( amd64 arm64 armhf i386 )

diff --git a/tests/README.md b/tests/README.md
@@ -10,7 +10,7 @@ Before running the snapweb automated tests, following should be ready
 
 ```shell
 cd tests/
-./run-tests.sh <USER> <IP> <PORT>
+./run-tests.sh <USER> <IP> <PORT> [sudo]
 ```
 
 Where 
@@ -21,6 +21,8 @@ IP = IP address of DUT
 
 PORT = SSH port of DUT
 
+sudo = specify sudo if sudo permissions are needed to install/remove snaps
+
 After test run finishes, xunit report will be generated under ./results/ directory
 
 If error occurs, screen shots can be found under ./errorShots/ folder
diff --git a/tests/get-token.sh b/tests/get-token.sh
diff --git a/tests/pageobjects/access-control-page.js b/tests/pageobjects/access-control-page.js
@@ -1,6 +1,6 @@
-var page = require('./page')
+var basepage = require('./basepage')
 
-var accessControlPage = Object.create(page, {
+var accessControlPage = Object.create(basepage, {
     /**
      * define elements
      */
@@ -18,7 +18,7 @@ var accessControlPage = Object.create(page, {
      */
     open: { value: function () {
 	browser.deleteCookie();
-        page.open.call(this, 'access-control');
+        basepage.open.call(this, 'access-control');
     } },
 
     submit_token: { value: function (token_value)  {

diff --git a/tests/pageobjects/basepage.js b/tests/pageobjects/basepage.js
@@ -0,0 +1,8 @@
+function BasePage () {
+}
+
+BasePage.prototype.open = function (path) {
+    browser.url('/' + path)
+}
+
+module.exports = new BasePage()
diff --git a/tests/pageobjects/installed-snaps-page.js b/tests/pageobjects/installed-snaps-page.js
@@ -1,7 +1,7 @@
-var page = require('./page')
+var basepage = require('./basepage')
 var acPage = require('./access-control-page')
 
-var installedSnapsPage = Object.create(page, {
+var installedSnapsPage = Object.create(basepage, {
     /**
      * define elements
      */
@@ -12,7 +12,6 @@ var installedSnapsPage = Object.create(page, {
     bugreport:    { get: function () { return browser.element("div.b-layout__footer a[href*=bugs]"); } },
     browsestore:    { get: function () { return browser.element("a=Browse store"); } },
     addmoresnaps:    { get: function () { return browser.element("a=Add more snaps for this device"); } },
-    snapwebsnap:    { get: function () { return browser.element(".p-card-deck").element("h3=snapweb"); } },
     installedsnaps: { get: function () { return browser.elements(".p-card h3.js-snap-title"); } },
     /**
      * define or overwrite page methods
@@ -38,8 +37,9 @@ var installedSnapsPage = Object.create(page, {
 	pcarddeck.waitForVisible();
 	return pcarddeck.element("h3="+snap_name);
 
-     } }
+     } },
 
+    snapwebsnap:    { get: function () { return this.snapElement("snapweb"); } }
 });
 
 module.exports = installedSnapsPage
diff --git a/tests/pageobjects/page.js b/tests/pageobjects/page.js
diff --git a/tests/wdio.conf.js b/tests/wdio.conf.js
@@ -145,7 +145,8 @@ exports.config = {
     // variables, such as `browser`. It is the perfect place to define custom commands.
      before: function (capabilities, specs) {
 	var sshSnapUtil = require('./utils/ssh-snap-util');
-	snaputil = new sshSnapUtil(process.env.HOST, process.env.USER, process.env.PORT, process.env.SSH_AUTH_SOCK, process.env.SUDO);
+        var env = process.env;
+	snaputil = new sshSnapUtil(env.HOST, env.USER, env.PORT, env.SSH_AUTH_SOCK, env.SUDO);
      },
     //
     // Hook that gets executed before the suite starts