Reorganise nodes into new categories

test/nodes/core/common/20-inject_spec.js

@@ -15,7 +15,7 @@
  **/
 
 var should = require("should");
-var injectNode = require("nr-test-utils").require("@node-red/nodes/core/core/20-inject.js");
+var injectNode = require("nr-test-utils").require("@node-red/nodes/core/common/20-inject.js");
 var Context = require("nr-test-utils").require("@node-red/runtime/lib/nodes/context");
 var helper = require("node-red-node-test-helper");
 

test/nodes/core/common/21-debug_spec.js

@@ -15,7 +15,7 @@
  **/
 
 var should = require("should");
-var debugNode = require("nr-test-utils").require("@node-red/nodes/core/core/58-debug.js");
+var debugNode = require("nr-test-utils").require("@node-red/nodes/core/common/21-debug.js");
 var helper = require("node-red-node-test-helper");
 var WebSocket = require('ws');
 

test/nodes/core/common/25-catch_spec.js

@@ -15,7 +15,7 @@
  **/
 
 var should = require("should");
-var catchNode = require("nr-test-utils").require("@node-red/nodes/core/core/25-catch.js");
+var catchNode = require("nr-test-utils").require("@node-red/nodes/core/common/25-catch.js");
 var helper = require("node-red-node-test-helper");
 
 describe('catch Node', function() {

test/nodes/core/common/25-status_spec.js

@@ -15,7 +15,7 @@
  **/
 
 var should = require("should");
-var catchNode = require("nr-test-utils").require("@node-red/nodes/core/core/25-status.js");
+var catchNode = require("nr-test-utils").require("@node-red/nodes/core/common/25-status.js");
 var helper = require("node-red-node-test-helper");
 
 describe('status Node', function() {

test/nodes/core/common/60-link_spec.js

@@ -15,7 +15,7 @@
  **/
 
 var should = require("should");
-var linkNode = require("nr-test-utils").require("@node-red/nodes/core/core/60-link.js");
+var linkNode = require("nr-test-utils").require("@node-red/nodes/core/common/60-link.js");
 var helper = require("node-red-node-test-helper");
 
 describe('link Node', function() {

test/nodes/core/common/90-comment_spec.js

@@ -15,7 +15,7 @@
  **/
 
 var should = require("should");
-var commentNode = require("nr-test-utils").require("@node-red/nodes/core/core/90-comment.js");
+var commentNode = require("nr-test-utils").require("@node-red/nodes/core/common/90-comment.js");
 var helper = require("node-red-node-test-helper");
 
 describe('comment Node', function() {

test/nodes/core/common/98-unknown_spec.js

@@ -15,7 +15,7 @@
  **/
 
 var should = require("should");
-var unknown = require("nr-test-utils").require("@node-red/nodes/core/core/98-unknown.js");
+var unknown = require("nr-test-utils").require("@node-red/nodes/core/common/98-unknown.js");
 var helper = require("node-red-node-test-helper");
 
 describe('unknown Node', function() {

test/nodes/core/function/10-function_spec.js

@@ -15,7 +15,7 @@
 **/
 
 var should = require("should");
-var functionNode = require("nr-test-utils").require("@node-red/nodes/core/core/80-function.js");
+var functionNode = require("nr-test-utils").require("@node-red/nodes/core/function/10-function.js");
 var Context = require("nr-test-utils").require("@node-red/runtime/lib/nodes/context");
 var helper = require("node-red-node-test-helper");
 

test/nodes/core/function/10-switch_spec.js

@@ -16,7 +16,7 @@
 
 var should = require("should");
 
-var switchNode = require("nr-test-utils").require("@node-red/nodes/core/logic/10-switch.js");
+var switchNode = require("nr-test-utils").require("@node-red/nodes/core/function/10-switch.js");
 var helper = require("node-red-node-test-helper");
 var RED = require("nr-test-utils").require("node-red/lib/red");
 var Context = require("nr-test-utils").require("@node-red/runtime/lib/nodes/context/");

test/nodes/core/function/15-change_spec.js

@@ -17,7 +17,7 @@
 var should = require("should");
 var sinon = require("sinon");
 
-var changeNode = require("nr-test-utils").require("@node-red/nodes/core/logic/15-change.js");
+var changeNode = require("nr-test-utils").require("@node-red/nodes/core/function/15-change.js");
 var Context = require("nr-test-utils").require("@node-red/runtime/lib/nodes/context");
 var helper = require("node-red-node-test-helper");
 

test/nodes/core/function/16-range_spec.js

@@ -16,7 +16,7 @@
 
 var should = require("should");
 
-var rangeNode = require("nr-test-utils").require("@node-red/nodes/core/logic/16-range.js");
+var rangeNode = require("nr-test-utils").require("@node-red/nodes/core/function/16-range.js");
 var helper = require("node-red-node-test-helper");
 
 describe('range Node', function() {

test/nodes/core/function/80-template_spec.js

@@ -15,7 +15,7 @@
  **/
 
 var should = require("should");
-var templateNode = require("nr-test-utils").require("@node-red/nodes/core/core/80-template.js");
+var templateNode = require("nr-test-utils").require("@node-red/nodes/core/function/80-template.js");
 var Context = require("nr-test-utils").require("@node-red/runtime/lib/nodes/context");
 var helper = require("node-red-node-test-helper");
 

test/nodes/core/function/89-delay_spec.js

@@ -16,7 +16,7 @@
 
 var should = require("should");
 
-var delayNode = require("nr-test-utils").require("@node-red/nodes/core/core/89-delay.js");
+var delayNode = require("nr-test-utils").require("@node-red/nodes/core/function/89-delay.js");
 var helper = require("node-red-node-test-helper");
 
 var GRACE_PERCENTAGE=10;

test/nodes/core/function/89-trigger_spec.js

@@ -17,7 +17,7 @@
 var should = require("should");
 var sinon = require("sinon");
 var helper = require("node-red-node-test-helper");
-var triggerNode = require("nr-test-utils").require("@node-red/nodes/core/core/89-trigger.js");
+var triggerNode = require("nr-test-utils").require("@node-red/nodes/core/function/89-trigger.js");
 var Context = require("nr-test-utils").require("@node-red/runtime/lib/nodes/context");
 var RED = require("nr-test-utils").require("node-red/lib/red");
 

test/nodes/core/function/90-exec_spec.js

@@ -17,7 +17,7 @@
 var should = require("should");
 var sinon = require("sinon");
 var helper = require("node-red-node-test-helper");
-var execNode = require("nr-test-utils").require("@node-red/nodes/core/core/75-exec.js");
+var execNode = require("nr-test-utils").require("@node-red/nodes/core/function/90-exec.js");
 var osType = require("os").type();
 
 var child_process = require('child_process');

test/nodes/core/sequence/17-split_spec.js

@@ -15,8 +15,8 @@
  **/
 
 var should = require("should");
-var splitNode = require("nr-test-utils").require("@node-red/nodes/core/logic/17-split.js");
-var joinNode = require("nr-test-utils").require("@node-red/nodes/core/logic/17-split.js");
+var splitNode = require("nr-test-utils").require("@node-red/nodes/core/sequence/17-split.js");
+var joinNode = require("nr-test-utils").require("@node-red/nodes/core/sequence/17-split.js");
 var helper = require("node-red-node-test-helper");
 var RED = require("nr-test-utils").require("node-red/lib/red.js");
 var Context = require("nr-test-utils").require("@node-red/runtime/lib/nodes/context");

test/nodes/core/sequence/18-sort_spec.js

@@ -15,7 +15,7 @@
  **/
 
 var should = require("should");
-var sortNode = require("nr-test-utils").require("@node-red/nodes/core/logic/18-sort.js");
+var sortNode = require("nr-test-utils").require("@node-red/nodes/core/sequence/18-sort.js");
 var helper = require("node-red-node-test-helper");
 var RED = require("nr-test-utils").require("node-red/lib/red.js");
 var Context = require("nr-test-utils").require("@node-red/runtime/lib/nodes/context");

test/nodes/core/sequence/19-batch_spec.js

@@ -15,7 +15,7 @@
  **/
 
 var should = require("should");
-var batchNode = require("nr-test-utils").require("@node-red/nodes/core/logic/19-batch.js");
+var batchNode = require("nr-test-utils").require("@node-red/nodes/core/sequence/19-batch.js");
 var helper = require("node-red-node-test-helper");
 var RED = require("nr-test-utils").require("node-red/lib/red.js");
 

test/nodes/core/storage/10-file_spec.js

@@ -20,7 +20,7 @@ var fs = require('fs-extra');
 var os = require('os');
 var sinon = require("sinon");
 var iconv = require("iconv-lite");
-var fileNode = require("nr-test-utils").require("@node-red/nodes/core/storage/50-file.js");
+var fileNode = require("nr-test-utils").require("@node-red/nodes/core/storage/10-file.js");
 var helper = require("node-red-node-test-helper");
 
 describe('file Nodes', function() {
@@ -31,7 +31,7 @@ describe('file Nodes', function() {
         }
         return iconv.encode(s, enc);
     }
-    
+
     function decode(data, enc) {
         if (enc === "none") {
             return data.toString();
@@ -780,7 +780,7 @@ describe('file Nodes', function() {
             it('should write to a file with "Big5" encoding', function(done) {
                 checkWriteWithEncoding("Big5", "test", done);
             });
-            
+
             it('should write to a file with "Big5-HKSCS" encoding', function(done) {
                 checkWriteWithEncoding("Big5-HKSCS", "test", done);
             });
@@ -1280,10 +1280,10 @@ describe('file Nodes', function() {
                     n1.receive({payload:""});
                 });
             }
-            
+
             // default
             it('should read in a file with "none" encoding', function(done) {
-                checkReadWithEncoding("none", "試験", done);                
+                checkReadWithEncoding("none", "試験", done);
             });
 
             // Native
@@ -1332,7 +1332,7 @@ describe('file Nodes', function() {
             it('should read in a file with "EUC-JP" encoding', function(done) {
                 checkReadWithEncoding("EUC-JP", "試験", done);
             });
-            
+
             // following encoding tests should be more specific
             // Chinese
             it('should read in a file with "GB2312" encoding', function(done) {
@@ -1372,7 +1372,7 @@ describe('file Nodes', function() {
             it('should read in a file with "Big5" encoding', function(done) {
                 checkReadWithEncoding("Big5", "test", done);
             });
-            
+
             it('should read in a file with "Big5-HKSCS" encoding', function(done) {
                 checkReadWithEncoding("Big5-HKSCS", "test", done);
             });
@@ -1621,8 +1621,8 @@ describe('file Nodes', function() {
             it('should read in a file with "tis620" encoding', function(done) {
                 checkReadWithEncoding("tis620", "test", done);
             });
-            
+
         });
-        
+
     });
 });

test/nodes/core/storage/23-watch_spec.js

@@ -18,7 +18,7 @@ var fs = require("fs-extra");
 var path = require("path");
 var should = require("should");
 var helper = require("node-red-node-test-helper");
-var watchNode = require("nr-test-utils").require("@node-red/nodes/core/io/23-watch.js");
+var watchNode = require("nr-test-utils").require("@node-red/nodes/core/storage/23-watch.js");
 
 
 describe('watch Node', function() {

test/nodes/subflow/subflow_spec.js

@@ -15,7 +15,7 @@
 **/
 
 var should = require("should");
-var functionNode = require("nr-test-utils").require("@node-red/nodes/core/core/80-function.js");
+var functionNode = require("nr-test-utils").require("@node-red/nodes/core/function/10-function.js");
 var helper = require("node-red-node-test-helper");
 
 // Notice: