Skip to content
This repository has been archived by the owner on Feb 17, 2021. It is now read-only.

Fixed test execution and added yarn.lock so it stays that way #360

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed test execution and added yarn.lock so it stays that way #360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 13 additions & 1 deletion Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,16 @@ const path = require('path');

module.exports = function(grunt) {
var HOPSCOTCH = 'hopscotch';

const requireTemplateOptions = {
requireConfig: {
baseUrl: '<%=paths.build%>/js',
paths: {
hopscotch: 'hopscotch_amd'
}
}
};

grunt.initConfig({
banner: ['/**! <%=pkg.name%> - v<%=pkg.version%>',
'*',
Expand Down Expand Up @@ -155,6 +165,7 @@ module.exports = function(grunt) {
specs: ['<%=paths.test%>/js/test.hopscotch.amd.js'],
styles: ['<%=paths.build%>/css/hopscotch.min.css'],
template: require('grunt-template-jasmine-requirejs'),
templateOptions: requireTemplateOptions,
vendor: ['node_modules/jquery/dist/jquery.min.js']
}
},
Expand All @@ -166,6 +177,7 @@ module.exports = function(grunt) {
specs: ['<%=paths.test%>/js/test.hopscotch.amd.js'],
styles: ['<%=paths.build%>/css/hopscotch.min.css'],
template: require('grunt-template-jasmine-requirejs'),
templateOptions: requireTemplateOptions,
vendor: ['node_modules/jquery/dist/jquery.min.js']
}
},
Expand All @@ -191,7 +203,7 @@ module.exports = function(grunt) {
src: '<%=paths.build%>/js/hopscotch_umd.js',
options: {
keepRunner: false,
specs: ['<%=paths.test%>/js/*.js'],
specs: ['<%=paths.test%>/js/test.hopscotch.js'],
vendor: ['node_modules/jquery/dist/jquery.min.js'],
styles: ['<%=paths.build%>/css/hopscotch.css'],
template: require('grunt-template-jasmine-istanbul'),
Expand Down
34 changes: 17 additions & 17 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,25 +28,25 @@
"babel-plugin-external-helpers": "^6.22.0",
"babel-preset-env": "^1.5.1",
"babel-preset-latest": "^6.24.1",
"grunt": "~0.4.1",
"grunt-bump": "~0.0.13",
"grunt-contrib-clean": "~0.5.0",
"grunt": "~1.0.2",
"grunt-bump": "~0.8.0",
"grunt-contrib-clean": "~1.1.0",
"grunt-contrib-compress": "~1.4.1",
"grunt-contrib-connect": "^0.9.0",
"grunt-contrib-copy": "~0.5.0",
"grunt-contrib-jasmine": "^0.9.2",
"grunt-contrib-jshint": "~0.6.0",
"grunt-contrib-jst": "~0.6.0",
"grunt-contrib-less": "~0.9.0",
"grunt-contrib-uglify": "~0.2.2",
"grunt-contrib-watch": "~0.5.1",
"grunt-include-replace": "~1.2.0",
"grunt-rollup": "^1.0.1",
"grunt-shell": "~0.3.1",
"grunt-template-jasmine-istanbul": "^0.3.0",
"grunt-template-jasmine-requirejs": "^0.2.3",
"grunt-contrib-connect": "^1.0.2",
"grunt-contrib-copy": "~1.0.0",
"grunt-contrib-jasmine": "^1.1.0",
"grunt-contrib-jshint": "~1.1.0",
"grunt-contrib-jst": "~1.0.0",
"grunt-contrib-less": "~1.4.1",
"grunt-contrib-uglify": "~3.3.0",
"grunt-contrib-watch": "~1.0.0",
"grunt-include-replace": "~5.0.0",
"grunt-rollup": "^2.0.0",
"grunt-shell": "~2.1.0",
"grunt-template-jasmine-istanbul": "^0.5.0",
"grunt-template-jasmine-requirejs": "git+https://github.com/radum/grunt-template-jasmine-requirejs.git#v0.4.1",
"jquery": "~2.1.0",
"rollup-plugin-babel": "^2.7.1",
"rollup-plugin-babel": "2.7.1",
"webpack": "^2.6.1"
}
}
2 changes: 1 addition & 1 deletion test/js/test.hopscotch.amd.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2379,4 +2379,4 @@ define(['hopscotch'], function(hopscotch) {
});
});
});
});
});
Loading