aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorBardi Harborow <[email protected]>2017-04-20 20:33:51 +1000
committerBardi Harborow <[email protected]>2017-04-21 21:08:40 +1000
commit2906b612d5bc3d7e33950044c9b89a91b117df03 (patch)
tree8426fb4115871eadc644a41e7ea8db4169056f23 /js
parentfb3303f5ddff2f57c3603ceabb6668d4a3cb559c (diff)
downloadbootstrap-2906b612d5bc3d7e33950044c9b89a91b117df03.tar.xz
bootstrap-2906b612d5bc3d7e33950044c9b89a91b117df03.zip
More minor build tweaks and docs updates.
Diffstat (limited to 'js')
-rw-r--r--js/.eslintrc.json9
-rw-r--r--js/tests/.eslintrc.json4
-rw-r--r--js/tests/README.md4
3 files changed, 8 insertions, 9 deletions
diff --git a/js/.eslintrc.json b/js/.eslintrc.json
index 07a307a74..69b361045 100644
--- a/js/.eslintrc.json
+++ b/js/.eslintrc.json
@@ -18,7 +18,6 @@
"no-extra-parens": "error",
"no-prototype-builtins": "off",
"no-template-curly-in-string": "error",
- "no-unsafe-negation": "error",
"valid-jsdoc": "error",
// Best Practices
@@ -45,7 +44,6 @@
"no-extra-bind": "error",
"no-extra-label": "error",
"no-floating-decimal": "error",
- "no-global-assign": "error",
"no-implicit-coercion": "error",
"no-implicit-globals": "error",
"no-implied-eval": "error",
@@ -70,9 +68,8 @@
],
"no-multi-str": "error",
"no-new": "error",
- "no-new-func": "off",
+ "no-new-func": "error",
"no-new-wrappers": "error",
- "no-new": "error",
"no-octal-escape": "error",
"no-param-reassign": "off",
"no-proto": "error",
@@ -94,6 +91,7 @@
"no-with": "error",
"prefer-promise-reject-errors": "error",
"radix": "error",
+ "require-await": "error",
"vars-on-top": "error",
"wrap-iife": "error",
"yoda": "error",
@@ -128,8 +126,8 @@
"array-bracket-spacing": "error",
"block-spacing": "error",
"brace-style": "error",
- "capitalized-comments": "off",
"camelcase": "error",
+ "capitalized-comments": "off",
"comma-dangle": "error",
"comma-spacing": "error",
"comma-style": "error",
@@ -227,6 +225,7 @@
"object-shorthand": "error",
"prefer-arrow-callback": "error",
"prefer-const": "error",
+ "prefer-destructuring": "off",
"prefer-numeric-literals": "error",
"prefer-rest-params": "error",
"prefer-spread": "error",
diff --git a/js/tests/.eslintrc.json b/js/tests/.eslintrc.json
index 889ea203d..a05a3a390 100644
--- a/js/tests/.eslintrc.json
+++ b/js/tests/.eslintrc.json
@@ -1,7 +1,7 @@
{
"env": {
- "qunit": true,
- "es6": false
+ "es6": false,
+ "qunit": true
},
"globals": {
"Util": false
diff --git a/js/tests/README.md b/js/tests/README.md
index b2d505723..72ece2d36 100644
--- a/js/tests/README.md
+++ b/js/tests/README.md
@@ -6,7 +6,7 @@ Bootstrap uses [QUnit](https://qunitjs.com/), a powerful, easy-to-use JavaScript
* `vendor/` contains third-party testing-related code (QUnit and jQuery).
* `visual/` contains "visual" tests which are run interactively in real browsers and require manual verification by humans.
-To run the unit test suite via [PhantomJS](http://phantomjs.org/), run `grunt test-js`.
+To run the unit test suite via [PhantomJS](http://phantomjs.org/), run `npm run js-test`.
To run the unit test suite via a real web browser, open `index.html` in the browser.
@@ -16,7 +16,7 @@ To run the unit test suite via a real web browser, open `index.html` in the brow
1. Locate and open the file dedicated to the plugin which you need to add tests to (`unit/<plugin-name>.js`).
2. Review the [QUnit API Documentation](https://api.qunitjs.com/) and use the existing tests as references for how to structure your new tests.
3. Write the necessary unit test(s) for the new or revised functionality.
-4. Run `grunt test-js` to see the results of your newly-added test(s).
+4. Run `npm run js-test` to see the results of your newly-added test(s).
**Note:** Your new unit tests should fail before your changes are applied to the plugin, and should pass after your changes are applied to the plugin.