Fix most of the browser tests running through grunt

Gruntfile.js

@@ -124,7 +124,7 @@ module.exports = function(grunt) {
         // version: '2.0.0-rc2',
         keepRunner: true,
         host: 'http://localhost:8081/',
-        vendor: 'test/browser/common.js',
+        vendor: ['test/browser/common.js', 'test/browser/less.js'],
         template: 'test/browser/test-runner-template.tmpl'
       },
       main: {
@@ -249,6 +249,7 @@ module.exports = function(grunt) {
 
   // Run all browser tests
   grunt.registerTask('browsertest', [
+    'browser',
     'connect',
     'jasmine'
   ]);
@@ -263,7 +264,6 @@ module.exports = function(grunt) {
     'clean',
     'jshint',
     'shell:test',
-    'browser',
     'browsertest'
   ]);
 

build/build.yml

@@ -63,8 +63,8 @@ browser:
   - <%= build.less.parser %>
   - <%= build.less.functions %>
   - <%= build.less.colors %>
-  - <%= build.less.treedir %> # glob all files
   - <%= build.less.tree %>
+  - <%= build.less.treedir %> # glob all files
   - <%= build.less.env %>
   - <%= build.less.visitor %>
   - <%= build.less.import_visitor %>
@@ -97,8 +97,8 @@ rhino:
   - <%= build.less.extend_visitor %>
   - <%= build.less.functions %>
   - <%= build.less.colors %>
-  - <%= build.less.treedir %> # glob all files
   - <%= build.less.tree %>
+  - <%= build.less.treedir %> # glob all files
   - <%= build.less.source_map_output %>
 
   # append rhino-specific code

test/browser/test-runner-template.tmpl

@@ -30,7 +30,7 @@
 
     <!-- less.js testing -->
     <% generateScriptTags([].concat(scripts.vendor, scripts.helpers)); %>
-      <script src="less.js"></script>
+
     <% generateScriptTags(scripts.specs); %>
 
     <!-- final grunt-contrib-jasmine scripts -->