fix: find variable in parent scope (strict_variables)

test/scope.js

@@ -71,21 +71,6 @@ describe('scope', function() {
             }).to.throw(/unbalanced '/);
         });
 
-        it('should throw undefined in strict mode', function() {
-            scope = Scope.factory(ctx, {
-                strict_variables: true
-            });
-
-            function fn() {
-                scope.get('notdefined');
-            }
-            expect(fn).to.throw(/undefined variable: notdefined/);
-        });
-
-        it('should get all properties when arguments empty', function() {
-            expect(scope.getAll()).deep.equal(ctx);
-        });
-
         it('should access child property via dot syntax', function() {
             expect(scope.get('bar.zoo')).to.equal('coo');
             expect(scope.get('bar.arr')).to.deep.equal(['a', 'b']);
@@ -116,6 +101,34 @@ describe('scope', function() {
         });
     });
 
+    describe('strict_variables', function() {
+        var scope;
+        beforeEach(function(){
+            scope = Scope.factory(ctx, {
+                strict_variables: true
+            });
+        });
+        it('should throw undefined in strict mode', function() {
+            function fn() {
+                scope.get('notdefined');
+            }
+            expect(fn).to.throw(/undefined variable: notdefined/);
+        });
+        it('should find variable in parent scope', function() {
+            scope.set('foo', 'foo');
+            scope.push({
+                'bar': 'bar'
+            });
+            expect(scope.get('foo')).to.equal('foo');
+        });
+    });
+
+    describe('.getAll()', function() {
+        it('should get all properties when arguments empty', function() {
+            expect(scope.getAll()).deep.equal(ctx);
+        });
+    });
+
     describe('.push()', function() {
         it('should throw when trying to push non-object', function() {
             expect(function() {

test/tags/include.js

@@ -29,8 +29,10 @@ describe('tags/include', function() {
         mock({
             '/illegal.html': '{%include%}',
         });
-        return expect(liquid.renderFile('/illegal.html')).to.
-            be.rejectedWith(ParseError, /illegal token {%include%}/);
+        return liquid.renderFile('/illegal.html').catch(function(e){
+            expect(e.name).to.equal('ParseError');
+            expect(e.message).to.match(/illegal token {%include%}/);
+        });
     });
 
     it('should support include with relative path', function() {

test/util/error.js

@@ -66,7 +66,8 @@ describe('error', function() {
             return engine.parseAndRender(src).catch(function(err) {
                 expect(err.name).to.equal('ParseError');
                 expect(err.input).to.equal('{% -a %}');
-                expect(err.line).to.equal(3);
+                expect(err.line).to.equal(3)
+                expect(err.stack).to.contain('From AssertionError: tag -a not found');
             });
         });
         it('should throw correct error info for files', function() {