From a53d0c091e7bbcf0fe559c320e6f3c9b024c80a0 Mon Sep 17 00:00:00 2001 From: Kazuhito Yokoi Date: Mon, 17 Feb 2020 19:03:45 +0900 Subject: [PATCH] Merge split and join node objects --- .../nodes/core/sequence/17-join_page.js | 27 ------------------- .../nodes/core/sequence/17-split_page.js | 8 ++++++ .../pageobjects/nodes/nodefactory_page.js | 2 +- 3 files changed, 9 insertions(+), 28 deletions(-) delete mode 100644 test/editor/pageobjects/nodes/core/sequence/17-join_page.js diff --git a/test/editor/pageobjects/nodes/core/sequence/17-join_page.js b/test/editor/pageobjects/nodes/core/sequence/17-join_page.js deleted file mode 100644 index 9426a64f9..000000000 --- a/test/editor/pageobjects/nodes/core/sequence/17-join_page.js +++ /dev/null @@ -1,27 +0,0 @@ -/** - * Copyright JS Foundation and other contributors, http://js.foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - **/ - -var util = require('util'); - -var nodePage = require('../../node_page'); - -function joinNode(id) { - nodePage.call(this, id); -} - -util.inherits(joinNode, nodePage); - -module.exports = joinNode; diff --git a/test/editor/pageobjects/nodes/core/sequence/17-split_page.js b/test/editor/pageobjects/nodes/core/sequence/17-split_page.js index 9426a64f9..6029e4d90 100644 --- a/test/editor/pageobjects/nodes/core/sequence/17-split_page.js +++ b/test/editor/pageobjects/nodes/core/sequence/17-split_page.js @@ -25,3 +25,11 @@ function joinNode(id) { util.inherits(joinNode, nodePage); module.exports = joinNode; + +function joinNode(id) { + nodePage.call(this, id); +} + +util.inherits(joinNode, nodePage); + +module.exports = joinNode; diff --git a/test/editor/pageobjects/nodes/nodefactory_page.js b/test/editor/pageobjects/nodes/nodefactory_page.js index 05ac8b4d4..33193e112 100644 --- a/test/editor/pageobjects/nodes/nodefactory_page.js +++ b/test/editor/pageobjects/nodes/nodefactory_page.js @@ -26,7 +26,7 @@ var httpInNode = require('./core/network/21-httpin_page'); var httpResponseNode = require('./core/network/21-httpresponse_page'); var httpRequestNode = require('./core/network/21-httprequest_page'); var splitNode = require('./core/sequence/17-split_page'); -var joinNode = require('./core/sequence/17-join_page'); +var joinNode = require('./core/sequence/17-split_page'); var csvNode = require('./core/parsers/70-CSV_page'); var htmlNode = require('./core/parsers/70-HTML_page'); var jsonNode = require('./core/parsers/70-JSON_page');