Fixes #3504 / organizes tests (#3523)

* Fixes #3504 / organizes tests

Author: matthew-dean

packages/less/Gruntfile.js

@@ -235,31 +235,31 @@ module.exports = function(grunt) {
                     // @TODO: make this more thorough
                     // CURRENT OPTIONS
                     // --math
-                    "node bin/lessc --math=always test/less/lazy-eval.less tmp/lazy-eval.css",
-                    "node bin/lessc --math=parens-division test/less/lazy-eval.less tmp/lazy-eval.css",
-                    "node bin/lessc --math=parens test/less/lazy-eval.less tmp/lazy-eval.css",
-                    "node bin/lessc --math=strict test/less/lazy-eval.less tmp/lazy-eval.css",
-                    "node bin/lessc --math=strict-legacy test/less/lazy-eval.less tmp/lazy-eval.css",
+                    "node bin/lessc --math=always test/less/_main/lazy-eval.less tmp/lazy-eval.css",
+                    "node bin/lessc --math=parens-division test/less/_main/lazy-eval.less tmp/lazy-eval.css",
+                    "node bin/lessc --math=parens test/less/_main/lazy-eval.less tmp/lazy-eval.css",
+                    "node bin/lessc --math=strict test/less/_main/lazy-eval.less tmp/lazy-eval.css",
+                    "node bin/lessc --math=strict-legacy test/less/_main/lazy-eval.less tmp/lazy-eval.css",
 
                     // DEPRECATED OPTIONS
                     // --strict-math
-                    "node bin/lessc --strict-math=on test/less/lazy-eval.less tmp/lazy-eval.css"
+                    "node bin/lessc --strict-math=on test/less/_main/lazy-eval.less tmp/lazy-eval.css"
                 ].join(" && ")
             },
             plugin: {
                 command: [
-                    'node bin/lessc --clean-css="--s1 --advanced" test/less/lazy-eval.less tmp/lazy-eval.css',
+                    'node bin/lessc --clean-css="--s1 --advanced" test/less/_main/lazy-eval.less tmp/lazy-eval.css',
                     "cd lib",
-                    'node ../bin/lessc --clean-css="--s1 --advanced" ../test/less/lazy-eval.less ../tmp/lazy-eval.css',
+                    'node ../bin/lessc --clean-css="--s1 --advanced" ../test/less/_main/lazy-eval.less ../tmp/lazy-eval.css',
                     "cd ..",
                     // Test multiple plugins
-                    'node bin/lessc --plugin=clean-css="--s1 --advanced" --plugin=autoprefix="ie 11,Edge >= 13,Chrome >= 47,Firefox >= 45,iOS >= 9.2,Safari >= 9" test/less/lazy-eval.less tmp/lazy-eval.css'
+                    'node bin/lessc --plugin=clean-css="--s1 --advanced" --plugin=autoprefix="ie 11,Edge >= 13,Chrome >= 47,Firefox >= 45,iOS >= 9.2,Safari >= 9" test/less/_main/lazy-eval.less tmp/lazy-eval.css'
                 ].join(" && ")
             },
             "sourcemap-test": {
                 // quoted value doesn't seem to get picked up by time-grunt, or isn't output, at least; maybe just "sourcemap" is fine?
                 command: [
-                    "node bin/lessc --source-map=test/sourcemaps/maps/import-map.map test/less/import.less test/sourcemaps/import.css",
+                    "node bin/lessc --source-map=test/sourcemaps/maps/import-map.map test/less/_main/import.less test/sourcemaps/import.css",
                     "node bin/lessc --source-map test/less/sourcemaps/basic.less test/sourcemaps/basic.css"
                 ].join(" && ")
             }

packages/less/lib/less/tree/import.js

@@ -171,11 +171,13 @@ class Import extends Node {
                 throw this.error;
             }
             return newImport;
-        } else {
+        } else if (this.root) {
             ruleset = new Ruleset(null, utils.copyArray(this.root.rules));
             ruleset.evalImports(context);
 
             return this.features ? new Media(ruleset.rules, this.features.value) : ruleset.rules;
+        } else {
+            return [];
         }
     }
 }

packages/less/lib/less/tree/import.js.map

@@ -3,14 +3,14 @@ module.exports = {
     main: {
     // src is used to build list of less files to compile
         src: [
-            "test/less/*.less",
-            "!test/less/plugin-preeval.less", // uses ES6 syntax
+            "test/less/_main/*.less",
+            "!test/less/_main/plugin-preeval.less", // uses ES6 syntax
             // Don't test NPM import, obviously
-            "!test/less/plugin-module.less",
-            "!test/less/import-module.less",
-            "!test/less/javascript.less",
-            "!test/less/urls.less",
-            "!test/less/empty.less"
+            "!test/less/_main/plugin-module.less",
+            "!test/less/_main/import-module.less",
+            "!test/less/_main/javascript.less",
+            "!test/less/_main/urls.less",
+            "!test/less/_main/empty.less"
         ],
         options: {
             helpers: "test/browser/runner-main-options.js",

packages/less/src/less/tree/import.js

@@ -13,8 +13,8 @@ var testFiles = ['charsets', 'colors', 'comments', 'css-3', 'strings', 'media',
 
 for (var i = 0; i < testFiles.length; i++) {
     var file = testFiles[i],
-        lessPath  = '/test/less/' + file + '.less',
-        cssPath   = '/test/css/' + file + '.css',
+        lessPath  = '/test/less/_main/' + file + '.less',
+        cssPath   = '/test/css/_main/' + file + '.css',
         lessStyle = document.createElement('style'),
         cssLink   = document.createElement('link'),
         lessText  = '@import "' + lessPath + '";';

packages/less/test/README.md

@@ -0,0 +1,3 @@
+.a {
+  b: c;
+}

packages/less/test/browser/generator/runner.config.js

@@ -7,13 +7,13 @@ console.log('\n' + stylize('Less', 'underline') + '\n');
 
 lessTester.prepBomTest();
 var testMap = [
-    [{}, 'namespacing/'],
     [{
         // TODO: Change this to rewriteUrls: 'all' once the relativeUrls option is removed
         relativeUrls: true,
         silent: true,
         javascriptEnabled: true
-    }],
+    }, '_main/'],
+    [{}, 'namespacing/'],
     [{
         math: 'strict-legacy'
     }, 'math/strict-legacy/'],
@@ -49,7 +49,7 @@ var testMap = [
             return path.join('test/sourcemaps', filename) + '.json';
         }],
 
-    [{math: 'strict', strictUnits: true, globalVars: true }, 'import/json/',
+    [{math: 'strict', strictUnits: true, globalVars: true }, '_main/import/json/',
         lessTester.testImports, null, true,
         function(filename, type, baseFolder) {
             return path.join(baseFolder, filename) + '.json';
@@ -67,20 +67,21 @@ var testMap = [
     [{rewriteUrls: 'local'}, 'rewrite-urls-local/'],
     [{rootpath: 'http://example.com/assets/css/', rewriteUrls: 'all'}, 'rootpath-rewrite-urls-all/'],
     [{rootpath: 'http://example.com/assets/css/', rewriteUrls: 'local'}, 'rootpath-rewrite-urls-local/'],
-    [{paths: ['test/data/', 'test/less/import/']}, 'include-path/'],
-    [{paths: 'test/data/'}, 'include-path-string/'],
+    [{paths: ['test/less/data/', 'test/less/_main/import/']}, 'include-path/'],
+    [{paths: 'test/less/data/'}, 'include-path-string/'],
     [{plugin: 'test/plugins/postprocess/'}, 'postProcessorPlugin/'],
     [{plugin: 'test/plugins/preprocess/'}, 'preProcessorPlugin/'],
     [{plugin: 'test/plugins/visitor/'}, 'visitorPlugin/'],
     [{plugin: 'test/plugins/filemanager/'}, 'filemanagerPlugin/'],
     [{}, 'no-strict-math/'],
-    [{}, '3rd-party/']
+    [{}, '3rd-party/'],
+    [{ processImports: false }, 'process-imports/']
 ];
 testMap.forEach(function(args) {
     lessTester.runTestSet.apply(lessTester, args)
 });
-lessTester.testSyncronous({syncImport: true}, 'import');
-lessTester.testSyncronous({syncImport: true}, 'plugin');
+lessTester.testSyncronous({syncImport: true}, '_main/import');
+lessTester.testSyncronous({syncImport: true}, '_main/plugin');
 lessTester.testSyncronous({syncImport: true}, 'math/strict-legacy/css');
 lessTester.testNoOptions();
 lessTester.testJSImport();

packages/less/test/browser/runner-browser-options.js

@@ -1,2 +1,2 @@
-@plugin "../plugin/plugin-tree-nodes";
+@plugin "../_main/plugin/plugin-tree-nodes";
 test-undefined();

packages/less/test/css/calc.css packages/less/test/css/_main/calc.css

@@ -1,3 +1,3 @@
 SyntaxError: Function 'test-undefined' is undefined in {path}functions-1.less on line 2, column 1:
-1 @plugin "../plugin/plugin-tree-nodes";
+1 @plugin "../_main/plugin/plugin-tree-nodes";
 2 test-undefined();

packages/less/test/css/charsets.css packages/less/test/css/_main/charsets.css

@@ -1,2 +1,2 @@
-@plugin "../plugin/plugin-tree-nodes";
+@plugin "../_main/plugin/plugin-tree-nodes";
 test-keyword();

packages/less/test/css/colors.css packages/less/test/css/_main/colors.css

@@ -1,3 +1,3 @@
 SyntaxError: Keyword node returned by a function is not valid here in {path}functions-10-keyword.less on line 2, column 1:
-1 @plugin "../plugin/plugin-tree-nodes";
+1 @plugin "../_main/plugin/plugin-tree-nodes";
 2 test-keyword();

packages/less/test/css/comments.css packages/less/test/css/_main/comments.css

@@ -1,2 +1,2 @@
-@plugin "../plugin/plugin-tree-nodes";
+@plugin "../_main/plugin/plugin-tree-nodes";
 test-operation();

packages/less/test/css/comments2.css packages/less/test/css/_main/comments2.css

@@ -1,3 +1,3 @@
 SyntaxError: Operation node returned by a function is not valid here in {path}functions-11-operation.less on line 2, column 1:
-1 @plugin "../plugin/plugin-tree-nodes";
+1 @plugin "../_main/plugin/plugin-tree-nodes";
 2 test-operation();

packages/less/test/css/css-3.css packages/less/test/css/_main/css-3.css

@@ -1,2 +1,2 @@
-@plugin "../plugin/plugin-tree-nodes";
+@plugin "../_main/plugin/plugin-tree-nodes";
 test-quoted();

packages/less/test/css/css-escapes.css packages/less/test/css/_main/css-escapes.css

@@ -1,3 +1,3 @@
 SyntaxError: Quoted node returned by a function is not valid here in {path}functions-12-quoted.less on line 2, column 1:
-1 @plugin "../plugin/plugin-tree-nodes";
+1 @plugin "../_main/plugin/plugin-tree-nodes";
 2 test-quoted();

packages/less/test/css/css-grid.css packages/less/test/css/_main/css-grid.css

@@ -1,2 +1,2 @@
-@plugin "../plugin/plugin-tree-nodes";
+@plugin "../_main/plugin/plugin-tree-nodes";
 test-selector();

packages/less/test/css/css-guards.css packages/less/test/css/_main/css-guards.css

@@ -1,3 +1,3 @@
 SyntaxError: Selector node returned by a function is not valid here in {path}functions-13-selector.less on line 2, column 1:
-1 @plugin "../plugin/plugin-tree-nodes";
+1 @plugin "../_main/plugin/plugin-tree-nodes";
 2 test-selector();

packages/less/test/css/detached-rulesets.css packages/less/test/css/_main/detached-rulesets.css

@@ -1,2 +1,2 @@
-@plugin "../plugin/plugin-tree-nodes";
+@plugin "../_main/plugin/plugin-tree-nodes";
 test-url();

packages/less/test/css/directives-bubling.css packages/less/test/css/_main/directives-bubling.css

@@ -1,3 +1,3 @@
 SyntaxError: Url node returned by a function is not valid here in {path}functions-14-url.less on line 2, column 1:
-1 @plugin "../plugin/plugin-tree-nodes";
+1 @plugin "../_main/plugin/plugin-tree-nodes";
 2 test-url();

packages/less/test/css/empty.css packages/less/test/css/_main/empty.css

@@ -1,2 +1,2 @@
-@plugin "../plugin/plugin-tree-nodes";
+@plugin "../_main/plugin/plugin-tree-nodes";
 test-value();

packages/less/test/css/extend-chaining.css packages/less/test/css/_main/extend-chaining.css

@@ -1,3 +1,3 @@
 SyntaxError: Value node returned by a function is not valid here in {path}functions-15-value.less on line 2, column 1:
-1 @plugin "../plugin/plugin-tree-nodes";
+1 @plugin "../_main/plugin/plugin-tree-nodes";
 2 test-value();

packages/less/test/css/extend-clearfix.css packages/less/test/css/_main/extend-clearfix.css

@@ -1,2 +1,2 @@
-@plugin "../plugin/plugin-tree-nodes";
+@plugin "../_main/plugin/plugin-tree-nodes";
 test-assignment();

packages/less/test/css/extend-exact.css packages/less/test/css/_main/extend-exact.css

@@ -1,3 +1,3 @@
 SyntaxError: Assignment node returned by a function is not valid here in {path}functions-3-assignment.less on line 2, column 1:
-1 @plugin "../plugin/plugin-tree-nodes";
+1 @plugin "../_main/plugin/plugin-tree-nodes";
 2 test-assignment();

packages/less/test/css/extend-media.css packages/less/test/css/_main/extend-media.css

@@ -1,2 +1,2 @@
-@plugin "../plugin/plugin-tree-nodes";
+@plugin "../_main/plugin/plugin-tree-nodes";
 test-call();

packages/less/test/css/extend-nest.css packages/less/test/css/_main/extend-nest.css

@@ -1,3 +1,3 @@
 SyntaxError: Function 'foo' is undefined in {path}functions-4-call.less on line 2, column 1:
-1 @plugin "../plugin/plugin-tree-nodes";
+1 @plugin "../_main/plugin/plugin-tree-nodes";
 2 test-call();

packages/less/test/css/extend-selector.css packages/less/test/css/_main/extend-selector.css

@@ -1,2 +1,2 @@
-@plugin "../plugin/plugin-tree-nodes";
+@plugin "../_main/plugin/plugin-tree-nodes";
 test-color();

packages/less/test/css/extend.css packages/less/test/css/_main/extend.css

@@ -1,3 +1,3 @@
 SyntaxError: Color node returned by a function is not valid here in {path}functions-5-color.less on line 2, column 1:
-1 @plugin "../plugin/plugin-tree-nodes";
+1 @plugin "../_main/plugin/plugin-tree-nodes";
 2 test-color();

packages/less/test/css/extract-and-length.css packages/less/test/css/_main/extract-and-length.css

@@ -1,2 +1,2 @@
-@plugin "../plugin/plugin-tree-nodes";
+@plugin "../_main/plugin/plugin-tree-nodes";
 test-condition();

packages/less/test/css/functions-each.css packages/less/test/css/_main/functions-each.css

@@ -1,3 +1,3 @@
 SyntaxError: Condition node returned by a function is not valid here in {path}functions-6-condition.less on line 2, column 1:
-1 @plugin "../plugin/plugin-tree-nodes";
+1 @plugin "../_main/plugin/plugin-tree-nodes";
 2 test-condition();

packages/less/test/css/functions.css packages/less/test/css/_main/functions.css

@@ -1,2 +1,2 @@
-@plugin "../plugin/plugin-tree-nodes";
+@plugin "../_main/plugin/plugin-tree-nodes";
 test-dimension();

packages/less/test/css/ie-filters.css packages/less/test/css/_main/ie-filters.css

@@ -1,3 +1,3 @@
 SyntaxError: Dimension node returned by a function is not valid here in {path}functions-7-dimension.less on line 2, column 1:
-1 @plugin "../plugin/plugin-tree-nodes";
+1 @plugin "../_main/plugin/plugin-tree-nodes";
 2 test-dimension();

packages/less/test/css/import-inline.css packages/less/test/css/_main/import-inline.css

@@ -1,2 +1,2 @@
-@plugin "../plugin/plugin-tree-nodes";
+@plugin "../_main/plugin/plugin-tree-nodes";
 test-element();

packages/less/test/css/import-interpolation.css packages/less/test/css/_main/import-interpolation.css

@@ -1,3 +1,3 @@
 SyntaxError: Element node returned by a function is not valid here in {path}functions-8-element.less on line 2, column 1:
-1 @plugin "../plugin/plugin-tree-nodes";
+1 @plugin "../_main/plugin/plugin-tree-nodes";
 2 test-element();

packages/less/test/css/import-module.css packages/less/test/css/_main/import-module.css

@@ -1,2 +1,2 @@
-@plugin "../plugin/plugin-tree-nodes";
+@plugin "../_main/plugin/plugin-tree-nodes";
 test-expression();

packages/less/test/css/import-once.css packages/less/test/css/_main/import-once.css

@@ -1,3 +1,3 @@
 SyntaxError: Expression node returned by a function is not valid here in {path}functions-9-expression.less on line 2, column 1:
-1 @plugin "../plugin/plugin-tree-nodes";
+1 @plugin "../_main/plugin/plugin-tree-nodes";
 2 test-expression();

packages/less/test/css/import-reference-issues.css packages/less/test/css/_main/import-reference-issues.css

@@ -1,2 +1,2 @@
-@plugin "../plugin/plugin-tree-nodes.js";
+@plugin "../_main/plugin/plugin-tree-nodes.js";
 test-undefined();

packages/less/test/css/import-reference.css packages/less/test/css/_main/import-reference.css

@@ -1,3 +1,3 @@
 SyntaxError: Function 'test-undefined' is undefined in {path}root-func-undefined-2.less on line 2, column 1:
-1 @plugin "../plugin/plugin-tree-nodes.js";
+1 @plugin "../_main/plugin/plugin-tree-nodes.js";
 2 test-undefined();

packages/less/test/css/import.css packages/less/test/css/_main/import.css

@@ -0,0 +1,3 @@
+@import url('https://fonts.googleapis.com/css?family=Open+Sans:400,700');
+
+.a { b: c; }

packages/less/test/css/javascript.css packages/less/test/css/_main/javascript.css

@@ -30,4 +30,4 @@
     url: url(@a);
 }
 
-@import "../import/import-and-relative-paths-test";
+@import "../_main/import/import-and-relative-paths-test";

packages/less/test/css/lazy-eval.css packages/less/test/css/_main/lazy-eval.css

@@ -33,19 +33,19 @@
     url: url(@a);
 }
 
-@import "../import/imports/font";
+@import "../_main/import/imports/font";
 
 #data-uri {
-  uri: data-uri('image/jpeg;base64', '../../data/image.jpg');
+  uri: data-uri('image/jpeg;base64', '../data/image.jpg');
 }
 
 #data-uri-guess {
-  uri: data-uri('../../data/image.jpg');
+  uri: data-uri('../data/image.jpg');
 }
 
 #data-uri-ascii {
-  uri-1: data-uri('text/html', '../../data/page.html');
-  uri-2: data-uri('../../data/page.html');
+  uri-1: data-uri('text/html', '../data/page.html');
+  uri-2: data-uri('../data/page.html');
 }
 
 #svg-functions {