less 3.10.1 → 3.11.1

package/test/browser/common.js

@@ -1,44 +1,3 @@
-/* Add js reporter for sauce */
-jasmine.getEnv().addReporter(new jasmine.JSReporter2());
-jasmine.getEnv().defaultTimeoutInterval = 3000;
-
-// From https://github.com/axemclion/grunt-saucelabs/issues/109#issuecomment-166767282
-// (function () {
-//     var oldJSReport = window.jasmine.getJSReport;
-//     window.jasmine.getJSReport = function () {
-//         var results = oldJSReport();
-//         if (results) {
-//             return {
-//                 durationSec: results.durationSec,
-//                 suites: removePassingTests(results.suites),
-//                 passed: results.passed
-//             };
-//         } else {
-//             return null;
-//         }
-//     };
-
-//     function removePassingTests (suites) {
-//         return suites.filter(specFailed)
-//             .map(mapSuite);
-//     }
-
-//     function mapSuite (suite) {
-//         var result = {};
-//         for (var s in suite) {
-//             result[s] = suite[s];
-//         }
-//         result.specs = suite.specs.filter(specFailed);
-//         result.suites = removePassingTests(suite.suites);
-//         return result;
-//     }
-
-//     function specFailed (item) {
-//         return !item.passed;
-//     }
-// })();
-/* record log messages for testing */
-
 var logMessages = [];
 window.less = window.less || {};
 
@@ -140,13 +99,15 @@ testSheet = function (sheet) {
                             window.navigator.userAgent.indexOf('Trident/') >= 0) {
                             text = ieFormat(text);
                         }
-                        expect(lessOutput).toEqual(text);
+                        expect(lessOutput).to.equal(text);
                         done();
+                    })
+                    .catch(function(err) {
+                        done(err);
                     });
             })
             .catch(function(err) {
-                console.log(err);
-                done();
+                done(err);
             });
     });
 };
@@ -213,11 +174,14 @@ testErrorSheet = function (sheet) {
                         .replace(/\{node\}[\s\S]*\{\/node\}/g, '')
                         .replace(/\n$/, '')
                         .trim();
-                    expect(actualErrorMsg).toEqual(errorTxt);
+                    expect(actualErrorMsg).to.equal(errorTxt);
                     if (errorTxt == actualErrorMsg) {
                         actualErrorElement.style.display = 'none';
                     }
                     done();
+                })
+                .catch(function (err) {
+                    done(err);
                 });
         });
     });
@@ -234,7 +198,7 @@ testErrorSheetConsole = function (sheet) {
                 .replace(/\nStack Trace\n[\s\S]*/, '');
 
         describe('the error', function () {
-            expect(actualErrorElement).toBe(null);
+            expect(actualErrorElement).to.be.null;
         });
 
         errorFile
@@ -246,7 +210,7 @@ testErrorSheetConsole = function (sheet) {
                     .replace(/\{404status\}/g, ' (404)')
                     .replace(/\{node\}.*\{\/node\}/g, '')
                     .trim();
-                expect(actualErrorMsg).toEqual(errorTxt);
+                expect(actualErrorMsg).to.equal(errorTxt);
                 done();
             });
     });
@@ -264,5 +228,3 @@ loadFile = function (href) {
         request.send(null);
     });
 };
-
-jasmine.DEFAULT_TIMEOUT_INTERVAL = 90000;

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

@@ -0,0 +1,50 @@
+
+module.exports = {
+    current: {
+    // src is used to build list of less files to compile
+        src: [
+            "benchmark/benchmark.less"
+        ],
+        options: {
+            helpers: "benchmark/browseroptions.js",
+            specs: "benchmark/browserspec.js",
+            outfile: "tmp/browser/test-runner-benchmark-current.html"
+        }
+    },
+    v3_10_3: {
+        // src is used to build list of less files to compile
+        src: [
+            "benchmark/benchmark.less"
+        ],
+        options: {
+            helpers: "benchmark/browseroptions.js",
+            specs: "benchmark/browserspec.js",
+            outfile: "tmp/browser/test-runner-benchmark-v3_10_3.html",
+            less: "https://cdnjs.cloudflare.com/ajax/libs/less.js/3.10.3/less.min.js"
+        }
+    },
+    v3_9_0: {
+        // src is used to build list of less files to compile
+        src: [
+            "benchmark/benchmark.less"
+        ],
+        options: {
+            helpers: "benchmark/browseroptions.js",
+            specs: "benchmark/browserspec.js",
+            outfile: "tmp/browser/test-runner-benchmark-v3_9_0.html",
+            less: "https://cdnjs.cloudflare.com/ajax/libs/less.js/3.9.0/less.min.js"
+        }
+    },
+    v2_7_3: {
+        // src is used to build list of less files to compile
+        src: [
+            "benchmark/benchmark.less"
+        ],
+        options: {
+            helpers: "benchmark/browseroptions.js",
+            specs: "benchmark/browserspec.js",
+            outfile: "tmp/browser/test-runner-benchmark-v2_7_3.html",
+            less: "https://cdnjs.cloudflare.com/ajax/libs/less.js/2.7.3/less.min.js"
+        }
+    }
+}

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>
+`
+}