Helpers defined later should override earlier ones.

cpsubrian · Oct 5, 2012 · 69edede · 69edede
1 parent c103466
commit 69edede
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/test/rendering.js b/test/rendering.js
@@ -100,8 +100,8 @@ describe('Rendering & Helpers', function() {
   });
 
   it('should respect String path-specific helpers', function(done) {
-    views.helper('/hey', {name: 'Donatello'});
     views.helper({name: 'Leonardo'});
+    views.helper('/hey', {name: 'Donatello'});
     server.on('request', function(req, res) {
       views.render(req, res, 'hello');
     });
@@ -120,8 +120,8 @@ describe('Rendering & Helpers', function() {
   });
 
   it('should respect RegExp path-specific helpers', function(done) {
-    views.helper(/^\/hello$/, {name: 'Donatello'});
     views.helper({name: 'Leonardo'});
+    views.helper(/^\/hello$/, {name: 'Donatello'});
     server.on('request', function(req, res) {
       views.render(req, res, 'hello');
     });

diff --git a/views.js b/views.js
@@ -495,13 +495,13 @@ Views.prototype._processHelpers = function(req, res, conf, callback) {
           if (typeof helper === 'function') {
             helper.call(views, req, res, function(err, data) {
               if (data) {
-                helpers.push(data);
+                helpers.unshift(data);
               }
               done(err);
             });
           }
           else {
-            helpers.push(helper);
+            helpers.unshift(helper);
             done(null);
           }
         });