1
0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00

Merge pull request #1922 from node-red-hitachi/dev-uitest-split

Followed runtime-editor split for UI test
This commit is contained in:
Nick O'Leary 2018-10-19 11:03:48 +01:00 committed by GitHub
commit 808d5a75ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 11 additions and 9 deletions

View File

@ -99,6 +99,7 @@
"istanbul": "0.4.5", "istanbul": "0.4.5",
"minami": "1.2.3", "minami": "1.2.3",
"mocha": "^5.2.0", "mocha": "^5.2.0",
"mosca": "^2.8.3",
"should": "^8.4.0", "should": "^8.4.0",
"sinon": "1.17.7", "sinon": "1.17.7",
"stoppable": "^1.0.6", "stoppable": "^1.0.6",

View File

@ -21,7 +21,7 @@ var fs = require('fs-extra');
var path = require('path'); var path = require('path');
var app = express(); var app = express();
var RED = require("../../red/red.js"); var RED = require("nr-test-utils").require("node-red/lib/red.js");
var utilPage = require("./pageobjects/util/util_page"); var utilPage = require("./pageobjects/util/util_page");

View File

@ -16,7 +16,7 @@
var when = require("when"); var when = require("when");
var events = require("../../../../red/runtime/events.js"); var events = require("nr-test-utils").require("@node-red/runtime/lib/events.js");
var palette = require("./palette_page"); var palette = require("./palette_page");
var nodeFactory = require("../nodes/nodefactory_page"); var nodeFactory = require("../nodes/nodefactory_page");

View File

@ -29,7 +29,7 @@ debugNode.prototype.setOutput = function(complete) {
browser.clickWithWait('//*[contains(@class, "red-ui-typedInput-container")]/button'); browser.clickWithWait('//*[contains(@class, "red-ui-typedInput-container")]/button');
if (complete !== 'true') { if (complete !== 'true') {
// Select the "msg" type. // Select the "msg" type.
browser.clickWithWait('/html/body/div[11]/a[1]'); browser.clickWithWait('//div[@class="red-ui-typedInput-options"][1]/a[1]');
// Input the path in msg. // Input the path in msg.
browser.clickWithWait('//*[contains(@class, "red-ui-typedInput-input")]/input'); browser.clickWithWait('//*[contains(@class, "red-ui-typedInput-input")]/input');
browser.keys(['Control', 'a', 'Control']); browser.keys(['Control', 'a', 'Control']);

View File

@ -54,8 +54,8 @@ changeNode.prototype.ruleSet = function(p, pt, to, tot, index) {
setT("set", index); setT("set", index);
if (pt) { if (pt) {
browser.clickWithWait('//*[@id="node-input-rule-container"]/li[' + index + ']/div/div[1]/div/button[1]'); browser.clickWithWait('//*[@id="node-input-rule-container"]/li[' + index + ']/div/div[1]/div/button[1]');
var num = 5 * index + 6; var num = 5 * (index - 1) + 1;
var ptXPath = '/html/body/div[' + num + ']/a[' + ptType[pt] + ']'; var ptXPath = '//div[@class="red-ui-typedInput-options"][' + num + ']/a[' + ptType[pt] + ']';
browser.clickWithWait(ptXPath); browser.clickWithWait(ptXPath);
} }
if (p) { if (p) {
@ -63,8 +63,8 @@ changeNode.prototype.ruleSet = function(p, pt, to, tot, index) {
} }
if (tot) { if (tot) {
browser.clickWithWait('//*[@id="node-input-rule-container"]/li[' + index + ']/div/div[2]/div[2]/button[1]'); browser.clickWithWait('//*[@id="node-input-rule-container"]/li[' + index + ']/div/div[2]/div[2]/button[1]');
var num = 5 * index + 7; var num = 5 * (index - 1) + 2;
var totXPath = '/html/body/div[' + num + ']/a[' + totType[tot] + ']'; var totXPath = '//div[@class="red-ui-typedInput-options"][' + num + ']/a[' + totType[tot] + ']';
browser.clickWithWait(totXPath); browser.clickWithWait(totXPath);
} }
if (to) { if (to) {

View File

@ -315,8 +315,9 @@ describe('cookbook', function() {
debugTab.open(); debugTab.open();
debugTab.clearMessage(); debugTab.clearMessage();
injectNode.clickLeftButton(); injectNode.clickLeftButton();
var message = debugTab.getMessage(); var messages = debugTab.getMessage();
message[1].indexOf('application/json').should.not.eql(-1); var contents = messages.join([separator = ""]);
contents.indexOf('application/json').should.not.eql(-1);
}); });
it('serve a local file', function () { it('serve a local file', function () {