Refactor UI testing code following a design note

test/editor/pageobjects/nodes/core/core/20-inject_page.js

@@ -24,7 +24,7 @@ function injectNode(id) {
 
 util.inherits(injectNode, nodePage);
 
-var payloadType = {
+var payloadTypeList = {
     "flow": 1,
     "global": 2,
     "str": 3,
@@ -36,54 +36,43 @@ var payloadType = {
     "env": 9,
 };
 
-var timeType = {
+var repeatTypeList = {
     "none": 1,
     "interval": 2,
     "intervalBetweenTimes": 3,
     "atASpecificTime": 4,
 };
 
-var timeType = {
-    "none": 1,
-    "interval": 2,
-    "intervalBetweenTimes": 3,
-    "atASpecificTime": 4,
-};
-
-var timeType = {
-    "none": 1,
-    "interval": 2,
-    "intervalBetweenTimes": 3,
-    "atASpecificTime": 4,
-};
-
-injectNode.prototype.setPayload = function(type, value) {
+injectNode.prototype.setPayload = function(payloadType, payload) {
     // Open a payload type list.
     browser.clickWithWait('//*[contains(@class, "red-ui-typedInput-container")]');
     // Select a payload type.
-    var payloadTypeXPath = '//*[@class="red-ui-typedInput-options"]/a[' + payloadType[type] + ']';
+    var payloadTypeXPath = '//*[@class="red-ui-typedInput-options"]/a[' + payloadTypeList[payloadType] + ']';
     browser.clickWithWait(payloadTypeXPath);
-    if (value) {
+    if (payload) {
         // Input a value.
-        browser.setValue('//*[@class="red-ui-typedInput-input"]/input', value);
+        browser.setValue('//*[@class="red-ui-typedInput-input"]/input', payload);
     }
 }
 
-injectNode.prototype.setTopic = function(value) {
-    browser.setValue('#node-input-topic', value);
+injectNode.prototype.setTopic = function(topic) {
+    browser.setValue('#node-input-topic', topic);
 }
 
-injectNode.prototype.setOnce = function(value) {
-    browser.clickWithWait('#node-input-once');
+injectNode.prototype.setOnce = function(once) {
+    var isChecked = browser.isSelected('#node-input-once');
+    if (isChecked !== once) {
+        browser.clickWithWait('#node-input-once');
+    }
 }
 
-injectNode.prototype.setTimeType = function(type) {
-    var timeTypeXPath = '//*[@id="inject-time-type-select"]/option[' + timeType[type] + ']';
-    browser.clickWithWait(timeTypeXPath);
+injectNode.prototype.setRepeat = function(repeatType) {
+    var repeatTypeXPath = '//*[@id="inject-time-type-select"]/option[' + repeatTypeList[repeatType] + ']';
+    browser.clickWithWait(repeatTypeXPath);
 }
 
-injectNode.prototype.setRepeat = function(sec) {
-    browser.setValue('#inject-time-interval-count', sec);
+injectNode.prototype.setRepeatInterval = function(repeat) {
+    browser.setValue('#inject-time-interval-count', repeat);
 }
 
 module.exports = injectNode;

test/editor/pageobjects/nodes/core/core/58-debug_page.js

@@ -24,22 +24,20 @@ function debugNode(id) {
 
 util.inherits(debugNode, nodePage);
 
-var target = {
-    "msg": 1,
-    "full": 2
-};
-
-debugNode.prototype.setTarget = function(type, value) {
+debugNode.prototype.setOutput = function(complete) {
     // Open a payload type list.
     browser.clickWithWait('//*[contains(@class, "red-ui-typedInput-container")]/button');
-    // Select a payload type.
-    var xPath = '/html/body/div[11]/a[' + target[type] + ']';
-    browser.clickWithWait(xPath);
-    if (value) {
+    if (complete !== 'true') {
+        // Select the "msg" type.
+        browser.clickWithWait('/html/body/div[11]/a[1]');
+        // Input the path in msg.
         browser.clickWithWait('//*[contains(@class, "red-ui-typedInput-input")]/input');
         browser.keys(['Control', 'a', 'Control']);
         browser.keys(['Delete']);
-        browser.setValue('//*[contains(@class, "red-ui-typedInput-input")]/input', value);
+        browser.setValue('//*[contains(@class, "red-ui-typedInput-input")]/input', complete);
+    } else {
+        // Select the "complete msg object" type.
+        browser.clickWithWait('/html/body/div[11]/a[2]');
     }
 }
 

test/editor/pageobjects/nodes/core/core/80-function_page.js

@@ -24,11 +24,11 @@ function functionNode(id) {
 
 util.inherits(functionNode, nodePage);
 
-functionNode.prototype.setCode = function(value) {
+functionNode.prototype.setFunction = function(func) {
     browser.click('#node-input-func-editor');
     browser.keys(['Control', 'Home', 'Control']);
-    for (var i=0; i<value.length; i++) {
-        browser.keys([value.substr(i, 1)]);
+    for (var i = 0; i < func.length; i++) {
+        browser.keys([func.substr(i, 1)]);
     }
 }
 

test/editor/pageobjects/nodes/core/core/80-template_page.js

@@ -24,29 +24,20 @@ function templateNode(id) {
 
 util.inherits(templateNode, nodePage);
 
-var syntaxType = {
-    "mustache": 1,
-    "plain": 2
-};
-
-templateNode.prototype.setSyntax = function(type) {
-    // Open a method type list.
-    browser.clickWithWait('#node-input-syntax');
-    // Select a method type.
-    var syntaxTypeXPath = '//*[@id="node-input-syntax"]/option[' + syntaxType[type] + ']';
-    browser.clickWithWait(syntaxTypeXPath);
+templateNode.prototype.setSyntax = function(syntax) {
+    browser.selectByValue('#node-input-syntax', syntax);
 }
 
-templateNode.prototype.setFormat = function(type) {
-    browser.selectByValue('#node-input-format', type);
+templateNode.prototype.setFormat = function(format) {
+    browser.selectByValue('#node-input-format', format);
 }
 
-templateNode.prototype.setTemplate = function(value) {
+templateNode.prototype.setTemplate = function(template) {
     browser.click('#node-input-template-editor');
     browser.keys(['Control', 'a', 'Control']); // call twice to release the keys.
     // Need to add a character one by one since some words such as 'Control' are treated as a special word.
-    for (var i=0; i<value.length; i++) {
-        browser.keys([value.charAt(i)]);
+    for (var i = 0; i < template.length; i++) {
+        browser.keys([template.charAt(i)]);
     }
     browser.keys(['Control', 'Shift', 'End', 'Shift', 'Control']);
     browser.keys(['Delete']);

test/editor/pageobjects/nodes/core/io/21-httpin_page.js

@@ -22,30 +22,14 @@ function httpinNode(id) {
     nodePage.call(this, id);
 }
 
-function setMethod(type) {
-    browser.selectByValue('#node-input-method', type);
-}
-
 util.inherits(httpinNode, nodePage);
 
-var methodType = {
-    "get": 1,
-    "post": 2,
-    "put": 3,
-    "delete": 4,
-    "patch": 5,
-};
-
-httpinNode.prototype.setMethod = function(type) {
-  // Open a method type list.
-  browser.clickWithWait('#node-input-method');
-  // Select a method type.
-  var methodTypeXPath = '//*[@id="node-input-method"]/option[' + methodType[type] + ']';
-  browser.clickWithWait(methodTypeXPath);
+httpinNode.prototype.setMethod = function(method) {
+    browser.selectByValue('#node-input-method', method);
 }
 
-httpinNode.prototype.setUrl = function(value) {
-    browser.setValue('#node-input-url', value);
+httpinNode.prototype.setUrl = function(url) {
+    browser.setValue('#node-input-url', url);
 }
 
 module.exports = httpinNode;

test/editor/pageobjects/nodes/core/io/21-httprequest_page.js

@@ -24,36 +24,16 @@ function httpRequestNode(id) {
 
 util.inherits(httpRequestNode, nodePage);
 
-var methodType = {
-    "get": 1,
-    "post": 2,
-    "put": 3,
-    "delete": 4,
-    "setByMsgMethod": 5,
-};
-
-var retType = {
-    "txt": 1,
-    "bin": 2,
-    "obj": 3,
-};
-
-httpRequestNode.prototype.setUrl = function(value) {
-    browser.setValue('#node-input-url', value);
+httpRequestNode.prototype.setUrl = function(url) {
+    browser.setValue('#node-input-url', url);
 }
 
-httpRequestNode.prototype.setMethod = function(type) {
-    // Open a method type list.
-    browser.clickWithWait('#node-input-method');
-    // Select a method type.
-    var methodTypeXPath = '//*[@id="node-input-method"]/option[' + methodType[type] + ']';
-    browser.clickWithWait(methodTypeXPath);
+httpRequestNode.prototype.setMethod = function(method) {
+    browser.selectByValue('#node-input-method', method);
 }
 
-httpRequestNode.prototype.setRet = function(type) {
-    browser.clickWithWait('#node-input-ret');
-    var retTypeXPath = '//*[@id="node-input-ret"]/option[' + retType[type] + ']';
-    browser.clickWithWait(retTypeXPath);
+httpRequestNode.prototype.setReturn = function(ret) {
+    browser.selectByValue('#node-input-ret', ret);
 }
 
 module.exports = httpRequestNode;

test/editor/pageobjects/nodes/core/logic/15-change_page.js

@@ -24,13 +24,6 @@ function changeNode(id) {
 
 util.inherits(changeNode, nodePage);
 
-var tType = {
-    "set": 1,
-    "change": 2,
-    "delete": 3,
-    "move": 4,
-};
-
 var totType = {
     "msg": 1,
     "flow": 2,
@@ -42,6 +35,7 @@ var totType = {
     "bin": 8,
     "date": 9,
     "jsonata": 10,
+    "env": 11,
 };
 
 var ptType = {
@@ -50,8 +44,8 @@ var ptType = {
     "global": 3,
 };
 
-function setT(rule, index) {
-    browser.selectByValue('//*[@id="node-input-rule-container"]/li[' + index + ']/div/div[1]/select', rule);
+function setT(t, index) {
+    browser.selectByValue('//*[@id="node-input-rule-container"]/li[' + index + ']/div/div[1]/select', t);
 }
 
 // It is better to create a function whose input value is the object type in the future,

test/editor/pageobjects/nodes/core/logic/16-range_page.js

@@ -24,8 +24,8 @@ function rangeNode(id) {
 
 util.inherits(rangeNode, nodePage);
 
-rangeNode.prototype.setAction = function(value) {
-    browser.selectByValue('#node-input-action', value);
+rangeNode.prototype.setAction = function(action) {
+    browser.selectByValue('#node-input-action', action);
 }
 
 rangeNode.prototype.setRange = function(minin, maxin, minout, maxout) {

test/editor/pageobjects/nodes/core/parsers/70-HTML_page.js

@@ -24,8 +24,8 @@ function htmlNode(id) {
 
 util.inherits(htmlNode, nodePage);
 
-htmlNode.prototype.setTag = function(value) {
-    browser.setValue('#node-input-tag', value);
+htmlNode.prototype.setSelector = function(tag) {
+    browser.setValue('#node-input-tag', tag);
 }
 
 module.exports = htmlNode;

test/editor/pageobjects/nodes/core/storage/50-filein_page.js

@@ -31,13 +31,13 @@ var formatType = {
     "stream": 4
 };
 
-fileinNode.prototype.setFilename = function(value) {
-    browser.setValue('#node-input-filename', value);
+fileinNode.prototype.setFilename = function(filename) {
+    browser.setValue('#node-input-filename', filename);
 }
 
-fileinNode.prototype.setFormat = function(type) {
+fileinNode.prototype.setOutput = function(format) {
     browser.clickWithWait('#node-input-format');
-    var formatTypeXPath = '//*[@id="node-input-format"]/option[' + formatType[type] + ']';
+    var formatTypeXPath = '//*[@id="node-input-format"]/option[' + formatType[format] + ']';
     browser.clickWithWait(formatTypeXPath);
 }
 

test/editor/specs/editor/workspace_uispec.js

@@ -19,8 +19,8 @@ var should = require("should");
 var fs = require('fs-extra');
 
 var helper = require("../../editor_helper");
-var debugTab = require('../../pageobjects/workspace/debugTab_page');
-var workspace = require('../../pageobjects/workspace/workspace_page');
+var debugTab = require('../../pageobjects/editor/debugTab_page');
+var workspace = require('../../pageobjects/editor/workspace_page');
 
 var nodeWidth = 200;
 

test/editor/specs/scenario/cookbook_endpoint_uispec.js

@@ -17,8 +17,8 @@
 var should = require("should");
 
 var helper = require("../../editor_helper");
-var debugTab = require('../../pageobjects/workspace/debugTab_page');
-var workspace = require('../../pageobjects/workspace/workspace_page');
+var debugTab = require('../../pageobjects/editor/debugTab_page');
+var workspace = require('../../pageobjects/editor/workspace_page');
 
 var nodeWidth = 200;
 var nodeHeight = 100;
@@ -65,7 +65,7 @@ describe('cookbook', function() {
 
             httpRequestNode.edit();
             httpRequestNode.setUrl(helper.url() + httpNodeRoot + '/hello');
-            httpRequestNode.setMethod("get");
+            httpRequestNode.setMethod("GET");
             httpRequestNode.clickOk();
 
             injectNode.connect(httpRequestNode);
@@ -105,7 +105,7 @@ describe('cookbook', function() {
 
             httpRequestNode.edit();
             httpRequestNode.setUrl(helper.url() + httpNodeRoot + '/hello-query?name=Nick');
-            httpRequestNode.setMethod("get");
+            httpRequestNode.setMethod("GET");
             httpRequestNode.clickOk();
 
             injectNode.connect(httpRequestNode);
@@ -145,7 +145,7 @@ describe('cookbook', function() {
 
             httpRequestNode.edit();
             httpRequestNode.setUrl(helper.url() + httpNodeRoot + '/hello-param/Dave');
-            httpRequestNode.setMethod("get");
+            httpRequestNode.setMethod("GET");
             httpRequestNode.clickOk();
 
             injectNode.connect(httpRequestNode);
@@ -190,7 +190,7 @@ describe('cookbook', function() {
 
             httpRequestNode.edit();
             httpRequestNode.setUrl(helper.url() + httpNodeRoot + '/hello-headers');
-            httpRequestNode.setMethod("get");
+            httpRequestNode.setMethod("GET");
             httpRequestNode.clickOk();
 
             injectNode.connect(changeNode);
@@ -249,7 +249,7 @@ describe('cookbook', function() {
             var debugNode = workspace.addNode("debug", nodeWidth * 2, nodeHeight * 2);
 
             httpRequestNode.edit();
-            httpRequestNode.setMethod("get");
+            httpRequestNode.setMethod("GET");
             httpRequestNode.setUrl(helper.url() + httpNodeRoot + '/hello-data');
             httpRequestNode.clickOk();
 
@@ -299,12 +299,12 @@ describe('cookbook', function() {
             var debugNode = workspace.addNode("debug", nodeWidth * 2, nodeHeight);
 
             httpRequestNode.edit();
-            httpRequestNode.setMethod("get");
+            httpRequestNode.setMethod("GET");
             httpRequestNode.setUrl(helper.url() + httpNodeRoot + '/hello-json');
             httpRequestNode.clickOk();
 
             debugNode.edit();
-            debugNode.setTarget("msg", "headers");
+            debugNode.setOutput("headers");
             debugNode.clickOk();
 
             injectNode.connect(httpRequestNode);
@@ -332,7 +332,7 @@ describe('cookbook', function() {
 
             fileinNode.edit();
             fileinNode.setFilename("test/resources/file-in-node/test.txt");
-            fileinNode.setFormat("");
+            fileinNode.setOutput("");
             fileinNode.clickOk();
 
             changeNode.edit();
@@ -352,7 +352,7 @@ describe('cookbook', function() {
 
             httpRequestNode.edit();
             httpRequestNode.setUrl(helper.url() + httpNodeRoot + '/hello-file');
-            httpRequestNode.setMethod("get");
+            httpRequestNode.setMethod("GET");
             httpRequestNode.clickOk();
 
             injectNode.connect(httpRequestNode);
@@ -396,7 +396,7 @@ describe('cookbook', function() {
 
             httpRequestNode.edit();
             httpRequestNode.setUrl(helper.url() + httpNodeRoot + '/hello-raw');
-            httpRequestNode.setMethod("post");
+            httpRequestNode.setMethod("POST");
             httpRequestNode.clickOk();
 
             injectNode.connect(httpRequestNode);
@@ -445,7 +445,7 @@ describe('cookbook', function() {
 
             httpRequestNode.edit();
             httpRequestNode.setUrl(helper.url() + httpNodeRoot + '/hello-form');
-            httpRequestNode.setMethod("post");
+            httpRequestNode.setMethod("POST");
             httpRequestNode.clickOk();
 
             injectNode.connect(changeNode);
@@ -495,7 +495,7 @@ describe('cookbook', function() {
 
             httpRequestNode.edit();
             httpRequestNode.setUrl(helper.url() + httpNodeRoot + '/hello-json');
-            httpRequestNode.setMethod("post");
+            httpRequestNode.setMethod("POST");
             httpRequestNode.clickOk();
 
             injectNode.connect(changeNode);
@@ -531,7 +531,7 @@ describe('cookbook', function() {
             httpinNodeFormat.clickOk();
 
             functionNodeFormat.edit();
-            functionNodeFormat.setCode("msg.payload = JSON.stringify(msg.req.cookies,null,4);");
+            functionNodeFormat.setFunction("msg.payload = JSON.stringify(msg.req.cookies,null,4);");
             functionNodeFormat.clickOk();
 
             templateNode.edit();
@@ -550,7 +550,7 @@ describe('cookbook', function() {
             httpinNodeAdd.clickOk();
 
             functionNodeAdd.edit();
-            functionNodeAdd.setCode("msg.cookies = { };\n msg.cookies[\"demo-\"+(Math.floor(Math.random()*1000))] = Date.now();");
+            functionNodeAdd.setFunction("msg.cookies = { };\n msg.cookies[\"demo-\"+(Math.floor(Math.random()*1000))] = Date.now();");
             functionNodeAdd.clickOk();
 
             changeNode.edit();
@@ -571,7 +571,7 @@ describe('cookbook', function() {
             httpinNodeClear.clickOk();
 
             functionNodeClear.edit();
-            functionNodeClear.setCode("var cookieNames = Object.keys(msg.req.cookies).filter(function(cookieName) { return /^demo-/.test(cookieName);});\nmsg.cookies = {};\n\ncookieNames.forEach(function(cookieName) {\n    msg.cookies[cookieName] = null;\n});\n\n");
+            functionNodeClear.setFunction("var cookieNames = Object.keys(msg.req.cookies).filter(function(cookieName) { return /^demo-/.test(cookieName);});\nmsg.cookies = {};\n\ncookieNames.forEach(function(cookieName) {\n    msg.cookies[cookieName] = null;\n});\n\n");
             functionNodeClear.clickOk();
 
             httpinNodeClear.connect(functionNodeClear);

test/editor/specs/scenario/cookbook_uispec.js

@@ -19,8 +19,8 @@ var should = require("should");
 var fs = require('fs-extra');
 
 var helper = require("../../editor_helper");
-var debugTab = require('../../pageobjects/workspace/debugTab_page');
-var workspace = require('../../pageobjects/workspace/workspace_page');
+var debugTab = require('../../pageobjects/editor/debugTab_page');
+var workspace = require('../../pageobjects/editor/workspace_page');
 var specUtil = require('../../pageobjects/util/spec_util_page');
 
 var nodeWidth = 200;
@@ -168,8 +168,8 @@ describe('cookbook', function() {
             var debugNode = workspace.addNode("debug", nodeWidth * 2);
 
             injectNode.edit();
-            injectNode.setTimeType("interval");
-            injectNode.setRepeat(1);
+            injectNode.setRepeat("interval");
+            injectNode.setRepeatInterval(1);
             injectNode.clickOk();
             injectNode.connect(debugNode);
 
@@ -196,12 +196,12 @@ describe('cookbook', function() {
             var debugNode = workspace.addNode("debug", nodeWidth * 3);
 
             httpRequetNode.edit();
-            httpRequetNode.setMethod("get");
+            httpRequetNode.setMethod("GET");
             httpRequetNode.setUrl(helper.url());
             httpRequetNode.clickOk();
 
             htmlNode.edit();
-            htmlNode.setTag("title");
+            htmlNode.setSelector("title");
             htmlNode.clickOk();
 
             injectNode.connect(httpRequetNode);
@@ -336,14 +336,14 @@ describe('cookbook', function() {
             changeNodeSetPost.clickOk();
 
             httpRequetNode.edit();
-            httpRequetNode.setMethod("get");
+            httpRequetNode.setMethod("GET");
             var url = helper.url() + httpNodeRoot + "/{{post}}";
             httpRequetNode.setUrl(url);
-            httpRequetNode.setRet("obj");
+            httpRequetNode.setReturn("obj");
             httpRequetNode.clickOk();
 
             debugNode.edit();
-            debugNode.setTarget("msg", "payload.title");
+            debugNode.setOutput("payload.title");
             debugNode.clickOk();
 
             injectNode.connect(changeNodeSetPost);
@@ -389,9 +389,9 @@ describe('cookbook', function() {
             var debugNode = workspace.addNode("debug", nodeWidth * 2);
 
             httpRequetNode.edit();
-            httpRequetNode.setMethod("get");
+            httpRequetNode.setMethod("GET");
             httpRequetNode.setUrl(helper.url() + "/settings");
-            httpRequetNode.setRet("bin");
+            httpRequetNode.setReturn("bin");
             httpRequetNode.clickOk();
 
             injectNode.connect(httpRequetNode);
@@ -413,11 +413,11 @@ describe('cookbook', function() {
             var debugNode = workspace.addNode("debug", nodeWidth * 3);
 
             functionNode.edit();
-            functionNode.setCode("msg.payload = \"data to post\";");
+            functionNode.setFunction("msg.payload = \"data to post\";");
             functionNode.clickOk();
 
             httpRequetNode.edit();
-            httpRequetNode.setMethod("post");
+            httpRequetNode.setMethod("POST");
             var url = helper.url() + httpNodeRoot + "/set-header";
             httpRequetNode.setUrl(url);
             httpRequetNode.clickOk();