beautify the javascript file

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

Hide file tree

Showing 7 changed files with 348 additions and 275 deletions.
diff --git a/tests/pageobjects/access-control-page.js b/tests/pageobjects/access-control-page.js
@@ -4,30 +4,66 @@ var accessControlPage = Object.create(basepage, {
     /**
      * define elements
      */
-    token: { get: function () { return browser.element('#token'); } },
-    submit_btn: { get: function () { return browser.element('#submit'); } },
-    homepage: { get: function () { return browser.element("header.p-navigation div.p-navigation__logo a[href*='/']"); } },
-    store:     { get: function () { return browser.element("nav.p-navigation__nav a[href*=store]"); } },
-    settings:     { get: function () { return browser.element("nav.p-navigation__nav a[href*=settings]"); } },
-    login_failed: { get: function () { return browser.element("label.statusmessage.has-error"); } },
-    token_cmd: { get: function () { return browser.element("//*[contains(text(),'sudo snapweb.generate-token')]"); } },
-    bugreport:    { get: function () { return browser.element("div.b-layout__footer a[href*=bugs]"); } },
+    token: {
+        get: function() {
+            return browser.element('#token');
+        }
+    },
+    submit_btn: {
+        get: function() {
+            return browser.element('#submit');
+        }
+    },
+    homepage: {
+        get: function() {
+            return browser.element("header.p-navigation div.p-navigation__logo a[href*='/']");
+        }
+    },
+    store: {
+        get: function() {
+            return browser.element("nav.p-navigation__nav a[href*=store]");
+        }
+    },
+    settings: {
+        get: function() {
+            return browser.element("nav.p-navigation__nav a[href*=settings]");
+        }
+    },
+    login_failed: {
+        get: function() {
+            return browser.element("label.statusmessage.has-error");
+        }
+    },
+    token_cmd: {
+        get: function() {
+            return browser.element("//*[contains(text(),'sudo snapweb.generate-token')]");
+        }
+    },
+    bugreport: {
+        get: function() {
+            return browser.element("div.b-layout__footer a[href*=bugs]");
+        }
+    },
 
     /**
      * define or overwrite page methods
      */
-    open: { value: function () {
-	browser.deleteCookie();
-        basepage.open.call(this, 'access-control');
-    } },
+    open: {
+        value: function() {
+            browser.deleteCookie();
+            basepage.open.call(this, 'access-control');
+        }
+    },
 
-    submit_token: { value: function (token_value)  {
+    submit_token: {
+        value: function(token_value) {
 
-        this.token.setValue(token_value);
-        this.submit_btn.click();
+            this.token.setValue(token_value);
+            this.submit_btn.click();
 
-     } }
+        }
+    }
 
 });
 
-module.exports = accessControlPage
+module.exports = accessControlPage
diff --git a/tests/pageobjects/basepage.js b/tests/pageobjects/basepage.js
@@ -1,8 +1,7 @@
-function BasePage () {
-}
+function BasePage() {}
 
-BasePage.prototype.open = function (path) {
+BasePage.prototype.open = function(path) {
     browser.url('/' + path)
 }
 
-module.exports = new BasePage()
+module.exports = new BasePage()
diff --git a/tests/pageobjects/installed-snaps-page.js b/tests/pageobjects/installed-snaps-page.js
@@ -1,45 +1,85 @@
 var basepage = require('./basepage')
 var acPage = require('./access-control-page')
- 
+
 var installedSnapsPage = Object.create(basepage, {
     /**
      * define elements
      */
-    homepage: { get: function () { return browser.element("header.p-navigation div.p-navigation__logo a[href*='/']"); } },
-    store:     { get: function () { return browser.element("nav.p-navigation__nav a[href*=store]"); } },
-    addsnapicon:     { get: function () { return browser.element("div.region-installed div.p-card a[href*=store] svg.p-card__icon"); } },
-    settings:     { get: function () { return browser.element("nav.p-navigation__nav a[href*=settings]"); } },
-    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"); } },
-    installedsnaps: { get: function () { return browser.elements(".p-card h3.js-snap-title"); } },
+    homepage: {
+        get: function() {
+            return browser.element("header.p-navigation div.p-navigation__logo a[href*='/']");
+        }
+    },
+    store: {
+        get: function() {
+            return browser.element("nav.p-navigation__nav a[href*=store]");
+        }
+    },
+    addsnapicon: {
+        get: function() {
+            return browser.element("div.region-installed div.p-card a[href*=store] svg.p-card__icon");
+        }
+    },
+    settings: {
+        get: function() {
+            return browser.element("nav.p-navigation__nav a[href*=settings]");
+        }
+    },
+    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");
+        }
+    },
+    installedsnaps: {
+        get: function() {
+            return browser.elements(".p-card h3.js-snap-title");
+        }
+    },
     /**
      * define or overwrite page methods
      */
-    open: { value: function() {
-	browser.deleteCookie();
-	acPage.open();
-	var valid_token = "";
-        browser.call(function () { 
-		return snaputil.getToken().then(function (res){
-                valid_token = res.trim();
+    open: {
+        value: function() {
+            browser.deleteCookie();
+            acPage.open();
+            var valid_token = "";
+            browser.call(function() {
+                return snaputil.getToken().then(function(res) {
+                    valid_token = res.trim();
                 });
-        });
-	acPage.submit_token(valid_token);
-	loginpage = browser.element('h2=Installed snaps');
-	loginpage.waitForVisible();
-    } },
+            });
+            acPage.submit_token(valid_token);
+            loginpage = browser.element('h2=Installed snaps');
+            loginpage.waitForVisible();
+        }
+    },
+
+
+    snapElement: {
+        value: function(snap_name) {
+
+            var pcarddeck = browser.element(".p-card-deck");
+            pcarddeck.waitForVisible();
+            return pcarddeck.element("h3=" + snap_name);
 
-
-    snapElement: { value: function (snap_name)  {
-
-	var pcarddeck = browser.element(".p-card-deck");
-	pcarddeck.waitForVisible();
-	return pcarddeck.element("h3="+snap_name);
+        }
+    },
 
-     } },
-
-    snapwebsnap:    { get: function () { return this.snapElement("snapweb"); } }
+    snapwebsnap: {
+        get: function() {
+            return this.snapElement("snapweb");
+        }
+    }
 });
 
-module.exports = installedSnapsPage
+module.exports = installedSnapsPage