Skip to content

Support grunt-contrib-jasmine 1.2.0 and newer #95

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
prantlf wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Support grunt-contrib-jasmine 1.2.0 and newer #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f583990
Updated code to work with Grunt 1.0.
May 17, 2016
0b8179a
Pin grunt-contrib-jasmine to 1.0.3 to avoid breaking change in 1.1.0 …
prantlf Nov 12, 2018
e5770cd
Replace task.copyTempFile with grunt.file.copy
prantlf Nov 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,15 @@
],
"license": "BSD",
"devDependencies": {
"grunt-contrib-jshint": "~0.6.4",
"grunt-contrib-watch": "~0.1.4",
"grunt": "~0.4.1",
"grunt-contrib-jasmine": "~0.6",
"grunt-contrib-connect": "~0.2.0",
"grunt-bump": "0.0.13",
"grunt-contrib-jshint": "~2.0.0",
"grunt-contrib-watch": "~1.1.0",
"grunt": "~1.0.3",
"grunt-contrib-jasmine": "~2.0.2",
"grunt-contrib-connect": "~2.0.0",
"grunt-bump": "0.8.0",
"grunt-npm": "0.0.2"
},
"dependencies": {
"lodash": "~4.17.11"
}
}
27 changes: 15 additions & 12 deletions src/template-jasmine-requirejs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
"use strict";

var _ = require('lodash');
var template = __dirname + '/templates/jasmine-requirejs.html',
requirejs = {
'2.0.0' : __dirname + '/../vendor/require-2.0.0.js',
Expand Down Expand Up @@ -44,7 +45,7 @@ function resolvePath(filepath) {
return path.resolve(filepath);
}

function moveRequireJs(grunt, task, versionOrPath) {
function moveRequireJs(grunt, tempDir, versionOrPath) {
var pathToRequireJS,
versionReg = /^(\d\.?)*$/;

Expand All @@ -60,7 +61,7 @@ function moveRequireJs(grunt, task, versionOrPath) {
throw new Error('local file path of requirejs [' + versionOrPath + '] was not found');
}
}
task.copyTempFile(pathToRequireJS,'require.js');
grunt.file.copy(pathToRequireJS, path.join(tempDir, 'require.js'));
}

exports.process = function(grunt, task, context) {
Expand All @@ -78,21 +79,21 @@ exports.process = function(grunt, task, context) {
// Extract config from main require config file
if (context.options.requireConfigFile) {
// Remove mainConfigFile from src files
var requireConfigFiles = grunt.util._.flatten([context.options.requireConfigFile]);
var requireConfigFiles = _.flatten([context.options.requireConfigFile]);

var normalizedPaths = grunt.util._.map(requireConfigFiles, function(configFile){
var normalizedPaths = _.map(requireConfigFiles, function(configFile){
return path.normalize(configFile);
});
context.scripts.src = grunt.util._.reject(context.scripts.src, function (script) {
return grunt.util._.contains(normalizedPaths, path.normalize(script));
context.scripts.src = _.reject(context.scripts.src, function (script) {
return _.includes(normalizedPaths, path.normalize(script));
});

var configFromFiles = {};
grunt.util._.map(requireConfigFiles, function (configFile) {
grunt.util._.merge(configFromFiles, parse.findConfig(grunt.file.read(configFile)).config);
_.map(requireConfigFiles, function (configFile) {
_.merge(configFromFiles, parse.findConfig(grunt.file.read(configFile)).config);
});

context.options.requireConfig = grunt.util._.merge(configFromFiles, context.options.requireConfig);
context.options.requireConfig = _.merge(configFromFiles, context.options.requireConfig);
}


Expand All @@ -119,7 +120,7 @@ exports.process = function(grunt, task, context) {
}

// Remove baseUrl and .js from src files
context.scripts.src = grunt.util._.map(context.scripts.src, getRelativeModuleUrl);
context.scripts.src = _.map(context.scripts.src, getRelativeModuleUrl);


// Prepend loaderPlugins to the appropriate files
Expand All @@ -133,7 +134,7 @@ exports.process = function(grunt, task, context) {
});
}

moveRequireJs(grunt, task, version);
moveRequireJs(grunt, context.temp, version);

context.serializeRequireConfig = function(requireConfig) {
var funcCounter = 0;
Expand Down Expand Up @@ -173,5 +174,7 @@ exports.process = function(grunt, task, context) {
context.temp);

var source = grunt.file.read(template);
return grunt.util._.template(source, context);
var tpl = _.template(source);

return tpl(context);
};