Skip to content

make tests rely upon dependencies in node_modules #785

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

Merged
merged 1 commit into from Sep 18, 2017
Merged

make tests rely upon dependencies in node_modules #785

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
6 changes: 3 additions & 3 deletions karma.conf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ module.exports = function(config) {

// list of files / patterns to load in the browser
files: [
'bower_components/jquery/dist/jquery.min.js',
'bower_components/jquery-ui/jquery-ui.min.js',
'bower_components/lodash/dist/lodash.min.js',
'node_modules/jquery/dist/jquery.min.js',
'node_modules/components-jqueryui/jquery-ui.min.js',
'node_modules/lodash/lodash.min.js',
'src/gridstack.js',
'src/gridstack.jQueryUI.js',
'spec/*-spec.js'
Expand Down
6 changes: 6 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"build": "grunt && doctoc ./README.md && doctoc ./doc/README.md && doctoc ./doc/CHANGES.md",
"test": "grunt lint && karma start karma.conf.js",
"lint": "grunt lint",
"reset": "rm -rf node_modules dist"
"reset": "rm -rf dist node_modules"
},
"keywords": [
"gridstack",
Expand All @@ -36,6 +36,7 @@
},
"devDependencies": {
"connect": "^3.4.1",
"components-jqueryui": "1.12.1",
"coveralls": "^2.11.8",
"doctoc": "^1.3.0",
"grunt": "^1.0.1",
Expand Down