From cc4f4fd3a7504448bc3f802ce09b8f0d7508eb92 Mon Sep 17 00:00:00 2001 From: Kazuhito Yokoi Date: Thu, 29 Mar 2018 07:17:30 +0000 Subject: [PATCH 1/3] Use helper module --- .travis.yml | 3 -- package.json | 1 + test/nodegen/helper.js | 28 ------------------- .../node-red-contrib-lowercase/node_spec.js | 2 +- .../node_spec.js | 2 +- 5 files changed, 3 insertions(+), 33 deletions(-) delete mode 100644 test/nodegen/helper.js diff --git a/.travis.yml b/.travis.yml index ceddd53..ec3db93 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,4 @@ before_script: - docker run -d -e SWAGGER_URL=http://petstore.swagger.io -e SWAGGER_BASE_PATH=/v2 -p 80:8080 swaggerapi/petstore - npm install -g istanbul - npm install coveralls - - npm install git+https://github.com/node-red/node-red.git - - export NODE_RED_HOME=`pwd`/node_modules/node-red - - (cd $NODE_RED_HOME ; npm install nock@~0.48.0) diff --git a/package.json b/package.json index 9d07fb0..70c5024 100644 --- a/package.json +++ b/package.json @@ -59,6 +59,7 @@ "grunt-simple-mocha": "0.4.1", "grunt-mocha-istanbul": "5.0.2", "should": "13.1.3", + "node-red-node-test-helper": "0.1.5", "sinon": "4.1.3", "supertest": "3.0.0", "del": "3.0.0", diff --git a/test/nodegen/helper.js b/test/nodegen/helper.js deleted file mode 100644 index 7a836eb..0000000 --- a/test/nodegen/helper.js +++ /dev/null @@ -1,28 +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 path = require('path'); - -process.env.NODE_RED_HOME = process.env.NODE_RED_HOME || path.resolve(__dirname+"/../../node-red"); -var helper = require(path.join(process.env.NODE_RED_HOME, 'test', 'nodes', 'helper.js')); - -try { - helper.nock = helper.nock || require("nock"); -} catch(er) { - helper.nock = null; -} -module.exports = helper; - diff --git a/test/nodegen/node-red-contrib-lowercase/node_spec.js b/test/nodegen/node-red-contrib-lowercase/node_spec.js index 9100515..2092961 100644 --- a/test/nodegen/node-red-contrib-lowercase/node_spec.js +++ b/test/nodegen/node-red-contrib-lowercase/node_spec.js @@ -15,8 +15,8 @@ **/ var should = require("should"); +var helper = require("node-red-node-test-helper"); var functionNode = require("../../../nodegen/node-red-contrib-lowercase/node.js"); -var helper = require("../helper.js"); describe('node-red-contrib-lowercase', function () { diff --git a/test/nodegen/node-red-contrib-swagger-petstore/node_spec.js b/test/nodegen/node-red-contrib-swagger-petstore/node_spec.js index cf37f69..ff2a587 100644 --- a/test/nodegen/node-red-contrib-swagger-petstore/node_spec.js +++ b/test/nodegen/node-red-contrib-swagger-petstore/node_spec.js @@ -15,8 +15,8 @@ **/ var should = require("should"); +var helper = require("node-red-node-test-helper"); var swaggerNode = require("../../../nodegen/node-red-contrib-swagger-petstore/node.js"); -var helper = require("../helper.js"); describe('node-red-contrib-swagger-petstore', function () { From 7872c2345855b119a1b2e8a304ef28627d8c5062 Mon Sep 17 00:00:00 2001 From: Kazuhito Yokoi Date: Thu, 29 Mar 2018 08:23:54 +0000 Subject: [PATCH 2/3] Revert .travis.yaml --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index ec3db93..ceddd53 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,4 +24,7 @@ before_script: - docker run -d -e SWAGGER_URL=http://petstore.swagger.io -e SWAGGER_BASE_PATH=/v2 -p 80:8080 swaggerapi/petstore - npm install -g istanbul - npm install coveralls + - npm install git+https://github.com/node-red/node-red.git + - export NODE_RED_HOME=`pwd`/node_modules/node-red + - (cd $NODE_RED_HOME ; npm install nock@~0.48.0) From 46f14f3bcc689db07d9e90ffc268bdcfdd110f7a Mon Sep 17 00:00:00 2001 From: Kazuhito Yokoi Date: Thu, 29 Mar 2018 08:33:19 +0000 Subject: [PATCH 3/3] Change git repository to npm repository in travis setting --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index ceddd53..87017bc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,8 +23,7 @@ before_script: - docker pull swaggerapi/petstore - docker run -d -e SWAGGER_URL=http://petstore.swagger.io -e SWAGGER_BASE_PATH=/v2 -p 80:8080 swaggerapi/petstore - npm install -g istanbul - - npm install coveralls - - npm install git+https://github.com/node-red/node-red.git + - npm install coveralls node-red - export NODE_RED_HOME=`pwd`/node_modules/node-red - (cd $NODE_RED_HOME ; npm install nock@~0.48.0)