Finished fixing browser tests

Author: matthew-dean

packages/less/Gruntfile.js

@@ -85,8 +85,7 @@ module.exports = function(grunt) {
         "relative-urls",
         "rewrite-urls",
         "browser",
-        "no-js-errors",
-        "legacy"
+        "no-js-errors"
     ];
 
     function makeJob(testName) {

packages/less/test/browser/common.js

@@ -169,7 +169,7 @@ testErrorSheet = function (sheet) {
                     errorTxt = errorTxt
                         .replace(/\{path\}/g, '')
                         .replace(/\{pathrel\}/g, '')
-                        .replace(/\{pathhref\}/g, 'http://localhost:8081/test/less/errors/')
+                        .replace(/\{pathhref\}/g, 'http://localhost:8081/packages/less/node_modules/@less/test-data/tests-error/eval/')
                         .replace(/\{404status\}/g, ' (404)')
                         .replace(/\{node\}[\s\S]*\{\/node\}/g, '')
                         .replace(/\n$/, '')

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

@@ -4,38 +4,32 @@ var { forceCovertToBrowserPath } = require('./utils');
 
 /** Root of repo */
 var testFolder = forceCovertToBrowserPath(path.dirname(resolve.sync('@less/test-data')));
-var lessFolder = forceCovertToBrowserPath(path.join(testFolder, 'less'));
+var testsUnitFolder = forceCovertToBrowserPath(path.join(testFolder, 'tests-unit'));
+var testsConfigFolder = forceCovertToBrowserPath(path.join(testFolder, 'tests-config'));
 var localTests = forceCovertToBrowserPath(path.resolve(__dirname, '..'));
 
 module.exports = {
     main: {
     // src is used to build list of less files to compile
         src: [
-            `${lessFolder}/_main/*.less`,
-            `!${lessFolder}/_main/plugin-preeval.less`, // uses ES6 syntax
+            `${testsUnitFolder}/*/*.less`,
+            `!${testsUnitFolder}/plugin-preeval/plugin-preeval.less`, // uses ES6 syntax
             // Don't test NPM import, obviously
-            `!${lessFolder}/_main/plugin-module.less`,
-            `!${lessFolder}/_main/import-module.less`,
-            `!${lessFolder}/_main/javascript.less`,
-            `!${lessFolder}/_main/urls.less`,
-            `!${lessFolder}/_main/empty.less`
+            `!${testsUnitFolder}/plugin-module/plugin-module.less`,
+            `!${testsUnitFolder}/import/import-module.less`,
+            `!${testsUnitFolder}/javascript/javascript.less`,
+            `!${testsUnitFolder}/urls/urls.less`,
+            `!${testsUnitFolder}/empty/empty.less`,
+            `!${testsUnitFolder}/color-functions/operations.less` // conflicts with operations/operations.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: [`${lessFolder}/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: [`${lessFolder}/units/strict/*.less`],
+        src: [`${testsConfigFolder}/units/strict/*.less`],
         options: {
             helpers: 'test/browser/runner-strict-units-options.js',
             specs: 'test/browser/runner-strict-units-spec.js',
@@ -44,8 +38,8 @@ module.exports = {
     },
     errors: {
         src: [
-            `${lessFolder}/errors/*.less`,
-            `${testFolder}/errors/javascript-error.less`,
+            `${testFolder}/tests-error/eval/*.less`,
+            `${testFolder}/tests-error/parse/*.less`,
             `${localTests}/less/errors/*.less`
         ],
         options: {
@@ -56,7 +50,7 @@ module.exports = {
         }
     },
     noJsErrors: {
-        src: [`${lessFolder}/no-js-errors/*.less`],
+        src: [`${testsConfigFolder}/no-js-errors/*.less`],
         options: {
             helpers: 'test/browser/runner-no-js-errors-options.js',
             specs: 'test/browser/runner-no-js-errors-spec.js',
@@ -141,7 +135,7 @@ module.exports = {
         }
     },
     postProcessorPlugin: {
-        src: [`${lessFolder}/postProcessorPlugin/*.less`],
+        src: [`${testsConfigFolder}/postProcessorPlugin/*.less`],
         options: {
             helpers: [
                 'test/plugins/postprocess/index.js',
@@ -153,7 +147,7 @@ module.exports = {
         }
     },
     preProcessorPlugin: {
-        src: [`${lessFolder}/preProcessorPlugin/*.less`],
+        src: [`${testsConfigFolder}/preProcessorPlugin/*.less`],
         options: {
             helpers: [
                 'test/plugins/preprocess/index.js',
@@ -164,7 +158,7 @@ module.exports = {
         }
     },
     visitorPlugin: {
-        src: [`${lessFolder}/visitorPlugin/*.less`],
+        src: [`${testsConfigFolder}/visitorPlugin/*.less`],
         options: {
             helpers: [
                 'test/plugins/visitor/index.js',
@@ -175,7 +169,7 @@ module.exports = {
         }
     },
     filemanagerPlugin: {
-        src: [`${lessFolder}/filemanagerPlugin/*.less`],
+        src: [`${testsConfigFolder}/filemanagerPlugin/*.less`],
         options: {
             helpers: [
                 'test/plugins/filemanager/index.js',

packages/less/test/browser/generator/template.js

@@ -25,9 +25,20 @@ module.exports = (stylesheets, helpers, spec, less) => {
     <!-- for each test, generate CSS/LESS link tags -->
     $${stylesheets.map(function(fullLessName) {
         var pathParts = fullLessName.split('/');
-        var fullCssName = fullLessName
-            .replace(/\/(browser|test-data)\/less\//g, '/$1/css/')
-            .replace(/less$/, 'css')
+        var fullCssName = fullLessName.replace(/less$/, 'css');
+        
+        // Check if the CSS file exists in the same directory as the LESS file
+        var fs = require('fs');
+        var cssExists = fs.existsSync(fullCssName);
+        
+        // If not, try the css/ directory for local browser tests
+        if (!cssExists && fullLessName.includes('/test/browser/less/')) {
+            var cssInCssDir = fullLessName.replace('/test/browser/less/', '/test/browser/css/').replace(/less$/, 'css');
+            if (fs.existsSync(cssInCssDir)) {
+                fullCssName = cssInCssDir;
+            }
+        }
+        
         var lessName = pathParts[pathParts.length - 1];
         var name = lessName.split('.')[0];
         return `

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

@@ -6,21 +6,21 @@ var less = {
 };
 
 // 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'],
+var testFiles = ['charsets/charsets', 'color-functions/basic', 'comments/comments', 'css-3/css-3', 'strings/strings', 'media/media', 'mixins/mixins'],
     testSheets = [];
 
 // setup style tags with less and link tags pointing to expected css output
 
 /**
  * @todo - generate the node_modules path for this file and in templates
  */
-var lessFolder = '../../node_modules/@less/test-data/less'
-var cssFolder = '../../node_modules/@less/test-data/css'
+var lessFolder = '../../node_modules/@less/test-data/tests-unit'
+var cssFolder = '../../node_modules/@less/test-data/tests-unit'
 
 for (var i = 0; i < testFiles.length; i++) {
     var file = testFiles[i],
-        lessPath  = lessFolder + '/_main/' + file + '.less',
-        cssPath   = cssFolder + '/_main/' + file + '.css',
+        lessPath  = lessFolder + '/' + file + '.less',
+        cssPath   = cssFolder + '/' + file + '.css',
         lessStyle = document.createElement('style'),
         cssLink   = document.createElement('link'),
         lessText  = '@import "' + lessPath + '";';