less 3.10.3 → 3.11.3

package/test/browser/generator/generate.js

@@ -0,0 +1,78 @@
+const template = require('./template')
+let config
+const fs = require('fs-extra')
+const path = require('path')
+const globby = require('globby')
+const { runner } = require('mocha-headless-chrome')
+
+
+if (process.argv[2]) {
+    config = require(`./${process.argv[2]}.config`)
+} else {
+    config = require('./runner.config')
+}
+
+/**
+ * Generate templates and run tests
+ */
+const tests = []
+const cwd = process.cwd()
+const tmpDir = path.join(cwd, 'tmp', 'browser')
+fs.ensureDirSync(tmpDir)
+fs.copySync(path.join(cwd, 'test', 'browser', 'common.js'), path.join(tmpDir, 'common.js'))
+
+let numTests = 0
+let passedTests = 0
+let failedTests = 0
+
+/** Will run the runners in a series */
+function runSerial(tasks) {
+    var result = Promise.resolve()
+    start = Date.now()
+    tasks.forEach(task => {
+        result = result.then(result => {
+            if (result && result.result && result.result.stats) {
+                const stats = result.result.stats
+                numTests += stats.tests
+                passedTests += stats.passes
+                failedTests += stats.failures
+            }
+            return task()
+        }, err => {
+            console.log(err)
+            failedTests += 1
+        })
+    })
+    return result
+}
+
+Object.entries(config).forEach(entry => {
+    const test = entry[1]
+    const paths = globby.sync(test.src)
+    const templateString = template(paths, test.options.helpers, test.options.specs)
+    fs.writeFileSync(path.join(cwd, test.options.outfile), templateString)
+    tests.push(() => {
+        const file = 'http://localhost:8081/' + test.options.outfile
+        console.log(file)
+        return runner({
+            file,
+            timeout: 2000,
+            args: ['disable-web-security']
+        })
+    })
+})
+
+module.exports = () => runSerial(tests).then(() => {
+    if (failedTests > 0) {
+        process.stderr.write(failedTests + ' Failed, ' + passedTests + ' passed\n');
+    } else {
+        process.stdout.write('All Passed ' + passedTests + ' run\n');
+    }
+    if (failedTests) {
+        process.on('exit', function() { process.reallyExit(1); });
+    }
+    process.exit()
+}, err => {
+    process.stderr.write(err.message);
+    process.exit()
+})

package/test/browser/generator/runner.config.js

@@ -0,0 +1,180 @@
+
+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
+            // 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"
+        ],
+        options: {
+            helpers: "test/browser/runner-main-options.js",
+            specs: "test/browser/runner-main-spec.js",
+            outfile: "tmp/browser/test-runner-main.html"
+        }
+    },
+    legacy: {
+        src: ["test/less/legacy/*.less"],
+        options: {
+            helpers: "test/browser/runner-legacy-options.js",
+            specs: "test/browser/runner-legacy-spec.js",
+            outfile: "tmp/browser/test-runner-legacy.html"
+        }
+    },
+    strictUnits: {
+        src: ["test/less/strict-units/*.less"],
+        options: {
+            helpers: "test/browser/runner-strict-units-options.js",
+            specs: "test/browser/runner-strict-units-spec.js",
+            outfile: "tmp/browser/test-runner-strict-units.html"
+        }
+    },
+    errors: {
+        src: [
+            "test/less/errors/*.less",
+            "!test/less/errors/javascript-error.less",
+            "test/browser/less/errors/*.less"
+        ],
+        options: {
+            timeout: 20000,
+            helpers: "test/browser/runner-errors-options.js",
+            specs: "test/browser/runner-errors-spec.js",
+            outfile: "tmp/browser/test-runner-errors.html"
+        }
+    },
+    noJsErrors: {
+        src: ["test/less/no-js-errors/*.less"],
+        options: {
+            helpers: "test/browser/runner-no-js-errors-options.js",
+            specs: "test/browser/runner-no-js-errors-spec.js",
+            outfile: "tmp/browser/test-runner-no-js-errors.html"
+        }
+    },
+    browser: {
+        src: [
+            "test/browser/less/*.less",
+            "test/browser/less/plugin/*.less"
+        ],
+        options: {
+            helpers: "test/browser/runner-browser-options.js",
+            specs: "test/browser/runner-browser-spec.js",
+            outfile: "tmp/browser/test-runner-browser.html"
+        }
+    },
+    relativeUrls: {
+        src: ["test/browser/less/relative-urls/*.less"],
+        options: {
+            helpers: "test/browser/runner-relative-urls-options.js",
+            specs: "test/browser/runner-relative-urls-spec.js",
+            outfile: "tmp/browser/test-runner-relative-urls.html"
+        }
+    },
+    rewriteUrls: {
+        src: ["test/browser/less/rewrite-urls/*.less"],
+        options: {
+            helpers: "test/browser/runner-rewrite-urls-options.js",
+            specs: "test/browser/runner-rewrite-urls-spec.js",
+            outfile: "tmp/browser/test-runner-rewrite-urls.html"
+        }
+    },
+    rootpath: {
+        src: ["test/browser/less/rootpath/*.less"],
+        options: {
+            helpers: "test/browser/runner-rootpath-options.js",
+            specs: "test/browser/runner-rootpath-spec.js",
+            outfile: "tmp/browser/test-runner-rootpath.html"
+        }
+    },
+    rootpathRelative: {
+        src: ["test/browser/less/rootpath-relative/*.less"],
+        options: {
+            helpers: "test/browser/runner-rootpath-relative-options.js",
+            specs: "test/browser/runner-rootpath-relative-spec.js",
+            outfile: "tmp/browser/test-runner-rootpath-relative.html"
+        }
+    },
+    rootpathRewriteUrls: {
+        src: ["test/browser/less/rootpath-rewrite-urls/*.less"],
+        options: {
+            helpers:
+            "test/browser/runner-rootpath-rewrite-urls-options.js",
+            specs: "test/browser/runner-rootpath-rewrite-urls-spec.js",
+            outfile:
+            "tmp/browser/test-runner-rootpath-rewrite-urls.html"
+        }
+    },
+    production: {
+        src: ["test/browser/less/production/*.less"],
+        options: {
+            helpers: "test/browser/runner-production-options.js",
+            specs: "test/browser/runner-production-spec.js",
+            outfile: "tmp/browser/test-runner-production.html"
+        }
+    },
+    modifyVars: {
+        src: ["test/browser/less/modify-vars/*.less"],
+        options: {
+            helpers: "test/browser/runner-modify-vars-options.js",
+            specs: "test/browser/runner-modify-vars-spec.js",
+            outfile: "tmp/browser/test-runner-modify-vars.html"
+        }
+    },
+    globalVars: {
+        src: ["test/browser/less/global-vars/*.less"],
+        options: {
+            helpers: "test/browser/runner-global-vars-options.js",
+            specs: "test/browser/runner-global-vars-spec.js",
+            outfile: "tmp/browser/test-runner-global-vars.html"
+        }
+    },
+    postProcessorPlugin: {
+        src: ["test/less/postProcessorPlugin/*.less"],
+        options: {
+            helpers: [
+                "test/plugins/postprocess/index.js",
+                "test/browser/runner-postProcessorPlugin-options.js"
+            ],
+            specs: "test/browser/runner-postProcessorPlugin.js",
+            outfile:
+            "tmp/browser/test-runner-post-processor-plugin.html"
+        }
+    },
+    preProcessorPlugin: {
+        src: ["test/less/preProcessorPlugin/*.less"],
+        options: {
+            helpers: [
+                "test/plugins/preprocess/index.js",
+                "test/browser/runner-preProcessorPlugin-options.js"
+            ],
+            specs: "test/browser/runner-preProcessorPlugin.js",
+            outfile: "tmp/browser/test-runner-pre-processor-plugin.html"
+        }
+    },
+    visitorPlugin: {
+        src: ["test/less/visitorPlugin/*.less"],
+        options: {
+            helpers: [
+                "test/plugins/visitor/index.js",
+                "test/browser/runner-VisitorPlugin-options.js"
+            ],
+            specs: "test/browser/runner-VisitorPlugin.js",
+            outfile: "tmp/browser/test-runner-visitor-plugin.html"
+        }
+    },
+    filemanagerPlugin: {
+        src: ["test/less/filemanagerPlugin/*.less"],
+        options: {
+            helpers: [
+                "test/plugins/filemanager/index.js",
+                "test/browser/runner-filemanagerPlugin-options.js"
+            ],
+            specs: "test/browser/runner-filemanagerPlugin.js",
+            outfile: "tmp/browser/test-runner-filemanager-plugin.html"
+        }
+    }
+}

package/test/browser/generator/runner.js

@@ -0,0 +1,2 @@
+const runner = require('./generate')
+runner()

package/test/browser/generator/template.js

@@ -0,0 +1,83 @@
+const html = require('html-template-tag')
+
+/**
+ * Generates HTML templates from list of test sheets
+ */
+module.exports = (stylesheets, helpers, spec, less) => {
+    if (!Array.isArray(helpers)) {
+        helpers = [helpers]
+    }
+    return html`
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    
+    <title>Less.js Spec Runner</title>
+
+    <!-- for each test, generate CSS/LESS link tags -->
+    $${stylesheets.map(function(fullLessName) {
+        var pathParts = fullLessName.split('/');
+        var fullCssName = fullLessName.replace(/less/g, 'css');
+        var lessName = pathParts[pathParts.length - 1];
+        var name = lessName.split('.')[0];
+        return `
+    <!-- the tags to be generated -->
+    <link id="original-less:test-less-${name}" title="test-less-${name}" rel="stylesheet/less" type="text/css" href="../../${fullLessName}">
+    <link id="expected-less:test-less-${name}" rel="stylesheet" type="text/css" href="../../${fullCssName}">
+    ` }).join('')}
+
+    $${helpers.map(helper => `
+        <script src="../../${helper}"></script>
+    `).join('')}
+
+    <link rel="stylesheet" href="../../node_modules/mocha/mocha.css">
+</head>
+
+<body>
+    <!-- content -->
+    <div id="mocha"></div>
+    <script src="../../node_modules/mocha/mocha.js"></script>
+    <script src="../../node_modules/mocha-teamcity-reporter/lib/teamcityBrowser.js"></script>
+    <script src="../../node_modules/chai/chai.js"></script>
+    <script>
+        expect = chai.expect
+        mocha.setup({
+            ui: 'bdd',
+            timeout: 1500
+        });
+    </script>
+    <script src="common.js"></script>
+    <script src="../../${spec}"></script>
+    <script src="${less || 'less.min.js'}"></script>
+    <script>
+        /** Saucelabs config */
+        onload = function() {
+            var runner = mocha.run();
+
+            var failedTests = [];
+            runner.on('end', function() {
+                window.mochaResults = runner.stats;
+                window.mochaResults.reports = failedTests;
+            });
+
+            runner.on('fail', logFailure);
+
+            function logFailure(test, err){
+                var flattenTitles = function(test){
+                    var titles = [];
+                    while (test.parent.title) {
+                        titles.push(test.parent.title);
+                        test = test.parent;
+                    }
+                    return titles.reverse();
+                };
+
+                failedTests.push({name: test.title, result: false, message: err.message, stack: err.stack, titles: flattenTitles(test) });
+            };
+        };
+    </script>
+</body>
+</html>
+`
+}

package/test/browser/runner-browser-options.js

@@ -5,12 +5,6 @@ var less = {
     math: 'always'
 };
 
-// There originally run inside describe method. However, since they have not
-// been inside it, they run at jasmine compile time (not runtime). It all
-// worked cause less.js was in async mode and custom phantom runner had
-// different setup then grunt-contrib-jasmine. They have been created before
-// less.js run, even as they have been defined in spec.
-
 // test inline less in style tags by grabbing an assortment of less files and doing `@import`s
 var testFiles = ['charsets', 'colors', 'comments', 'css-3', 'strings', 'media', 'mixins'],
     testSheets = [];

package/test/browser/runner-browser-spec.js

@@ -2,7 +2,7 @@ describe('less.js browser behaviour', function() {
     testLessEqualsInDocument();
 
     it('has some log messages', function() {
-        expect(logMessages.length).toBeGreaterThan(0);
+        expect(logMessages.length).to.be.above(0);
     });
 
     for (var i = 0; i < testFiles.length; i++) {

package/test/browser/runner-main-spec.js

@@ -2,6 +2,6 @@ console.warn('start spec');
 describe('less.js main tests', function() {
     testLessEqualsInDocument();
     it('the global environment', function() {
-        expect(window.require).toBe(undefined);
+        expect(window.require).to.be.undefined;
     });
 });

package/test/browser/runner-modify-vars-spec.js

@@ -27,7 +27,7 @@ describe('less.js modify vars', function () {
         var xhrLogMessages = logMessages.filter(function (item) {
             return (/XHR: Getting '/).test(item);
         });
-        expect(xhrLogMessages.length).toEqual(2);
+        expect(xhrLogMessages.length).to.equal(2);
         done();
     });
 });

package/test/browser/runner-production-spec.js

@@ -1,5 +1,5 @@
 describe('less.js production behaviour', function() {
     it('doesn\'t log any messages', function() {
-        expect(logMessages.length).toEqual(0);
+        expect(logMessages.length).to.equal(0);
     });
 });

package/test/css/calc.css

@@ -17,3 +17,12 @@
 .c {
   height: calc(100% - ((10px * 3) + (10px * 2)));
 }
+.correctly-exit-calc-mode h2 {
+  width: 10px;
+}
+.correctly-exit-calc-mode div {
+  width: calc(100px * 2);
+}
+.correctly-exit-calc-mode h1 {
+  color: white;
+}

package/test/css/comments.css

@@ -52,7 +52,7 @@
   -webkit-border-radius: 2px /* webkit only */;
   -moz-border-radius: 8px /* moz only with operation */;
 }
-.test {
+.test-rule {
   color: 1px;
 }
 .sr-only-focusable {

package/test/css/css-3.css

@@ -18,21 +18,21 @@ p:not([class*="lead"]) {
   color: black;
 }
 input[type="text"].class#id[attr=32]:not(1) {
-  color: white;
+  color: inherit;
 }
 div#id.class[a=1][b=2].class:not(1) {
-  color: white;
+  color: inherit;
 }
 ul.comma > li:not(:only-child)::after {
-  color: white;
+  color: inherit;
 }
 ol.comma > li:nth-last-child(2)::after {
-  color: white;
+  color: inherit;
 }
 li:nth-child(4n+1),
 li:nth-child(-5n),
 li:nth-child(-n+2) {
-  color: white;
+  color: inherit;
 }
 a[href^="http://"] {
   color: black;

package/test/css/css-guards.css

@@ -10,7 +10,7 @@
 .multiple-conditions-1 {
   color: red;
 }
-.inheritance .test {
+.inheritance .test-rule {
   color: black;
 }
 .inheritance:hover {

package/test/css/debug/linenumbers-all.css

@@ -9,12 +9,12 @@
 }
 /* line 15, {path}linenumbers.less */
 @media -sass-debug-info{filename{font-family:file\:\/\/{pathesc}linenumbers\.less}line{font-family:\0000315}}
-.test1 {
+.test-rule1 {
   color: black;
 }
 /* line 6, {path}linenumbers.less */
 @media -sass-debug-info{filename{font-family:file\:\/\/{pathesc}linenumbers\.less}line{font-family:\000036}}
-.test2 {
+.test-rule2 {
   color: red;
 }
 @media all {
@@ -33,17 +33,17 @@
   /* line 9, {pathimport}test.less */
   @media -sass-debug-info{filename{font-family:file\:\/\/{pathimportesc}test\.less}line{font-family:\000039}}
   .tst .tst3 {
-    color: white;
+    color: inherit;
   }
 }
 /* line 18, {pathimport}test.less */
 @media -sass-debug-info{filename{font-family:file\:\/\/{pathimportesc}test\.less}line{font-family:\0000318}}
 .tst2 {
-  color: white;
+  color: inherit;
 }
 /* line 27, {path}linenumbers.less */
 @media -sass-debug-info{filename{font-family:file\:\/\/{pathesc}linenumbers\.less}line{font-family:\0000327}}
-.test {
+.test-rule {
   color: red;
   width: 2;
 }

package/test/css/debug/linenumbers-comments.css

@@ -6,11 +6,11 @@
   color: grey;
 }
 /* line 15, {path}linenumbers.less */
-.test1 {
+.test-rule1 {
   color: black;
 }
 /* line 6, {path}linenumbers.less */
-.test2 {
+.test-rule2 {
   color: red;
 }
 @media all {
@@ -26,15 +26,15 @@
   }
   /* line 9, {pathimport}test.less */
   .tst .tst3 {
-    color: white;
+    color: inherit;
   }
 }
 /* line 18, {pathimport}test.less */
 .tst2 {
-  color: white;
+  color: inherit;
 }
 /* line 27, {path}linenumbers.less */
-.test {
+.test-rule {
   color: red;
   width: 2;
 }

package/test/css/debug/linenumbers-mediaquery.css

@@ -6,11 +6,11 @@
   color: grey;
 }
 @media -sass-debug-info{filename{font-family:file\:\/\/{pathesc}linenumbers\.less}line{font-family:\0000315}}
-.test1 {
+.test-rule1 {
   color: black;
 }
 @media -sass-debug-info{filename{font-family:file\:\/\/{pathesc}linenumbers\.less}line{font-family:\000036}}
-.test2 {
+.test-rule2 {
   color: red;
 }
 @media all {
@@ -26,15 +26,15 @@
   }
   @media -sass-debug-info{filename{font-family:file\:\/\/{pathimportesc}test\.less}line{font-family:\000039}}
   .tst .tst3 {
-    color: white;
+    color: inherit;
   }
 }
 @media -sass-debug-info{filename{font-family:file\:\/\/{pathimportesc}test\.less}line{font-family:\0000318}}
 .tst2 {
-  color: white;
+  color: inherit;
 }
 @media -sass-debug-info{filename{font-family:file\:\/\/{pathesc}linenumbers\.less}line{font-family:\0000327}}
-.test {
+.test-rule {
   color: red;
   width: 2;
 }

package/test/css/extend-chaining.css

@@ -15,7 +15,7 @@
 }
 .i.j,
 .k.j {
-  color: white;
+  color: inherit;
 }
 .l,
 .m,
@@ -58,7 +58,7 @@
 }
 .vb,
 .vc {
-  color: white;
+  color: inherit;
 }
 @media tv {
   .ma,
@@ -70,7 +70,7 @@
   .ma,
   .mb,
   .mc {
-    color: white;
+    color: inherit;
   }
 }
 @media tv and plasma {

package/test/css/extend-media.css

@@ -6,7 +6,7 @@
   .ext1 .ext3,
   .tv-lowres .ext3,
   .all .ext3 {
-    color: white;
+    color: inherit;
   }
   .tv-lowres {
     background: blue;

package/test/css/extend-nest.css

@@ -28,7 +28,7 @@
 }
 .button:hover,
 .submit:hover {
-  color: white;
+  color: inherit;
 }
 .button2 :hover {
   nested: white;

package/test/css/filemanagerPlugin/filemanager.css

@@ -1,3 +1,3 @@
-.test {
+.test-rule {
   color: red;
 }

package/test/css/functions-each.css

@@ -70,7 +70,7 @@
   -less-log: c;
   -less-log: d;
 }
-.test {
+.test-rule {
   color: blue;
   color: red;
 }

package/test/css/import-once.css

@@ -4,12 +4,12 @@
 body {
   width: 100%;
 }
-.test-f {
+.test-rule-f {
   height: 10px;
 }
 body {
   width: 100%;
 }
-.test-f {
+.test-rule-f {
   height: 10px;
 }

package/test/css/import-reference-issues.css

@@ -1,4 +1,4 @@
-.test-c {
+.test-rule-c {
   background-color: green;
 }
 .theOnlySelector {