Permalink
Browse files

Merge remote-tracking branch 'upstream/master'

  • Loading branch information...
2 parents 6103547 + 203794d commit 43da2d7f6aa6ade252613aabf0c01c091359b7d3 @jannehietamaki committed Nov 17, 2012
Showing with 4 additions and 1 deletion.
  1. +1 −1 grunt.js
  2. +3 −0 test/require_test.js
View
@@ -1,5 +1,5 @@
module.exports = function(grunt) {
-
+ "use strict";
grunt.loadTasks('tasks');
// Project configuration.
View
@@ -10,10 +10,12 @@ var almondify = require('../lib/almondify').init(grunt);
exports['require'] = {
setUp: function(done) {
// setup here
+ "use strict";
done();
},
// require_size_info helper test
'testRequireSizeInfoHelper': function(test) {
+ "use strict";
var helperValuesSeriesA = sizeInfo.info('a', true, 'foo'),
helperValuesSeriesB = sizeInfo.info('b', false, 'foobar');
test.expect(10);
@@ -34,6 +36,7 @@ exports['require'] = {
test.done();
},
'almond helper runs callback even if almond: false': function(test) {
+ "use strict";
var wasCalled = false,
options = {
config: {

0 comments on commit 43da2d7

Please sign in to comment.