diff --git a/.babelrc.js b/.babelrc.js
index 44a509954105..1d6404edbe5f 100644
--- a/.babelrc.js
+++ b/.babelrc.js
@@ -1,17 +1,14 @@
module.exports = {
presets: [
[
- '@babel/env',
+ '@babel/preset-env',
{
loose: true,
- modules: false,
- exclude: ['transform-typeof-symbol']
+ bugfixes: true,
+ modules: false
}
]
],
- plugins: [
- '@babel/plugin-proposal-object-rest-spread'
- ],
env: {
test: {
plugins: [ 'istanbul' ]
diff --git a/.bundlewatch.config.json b/.bundlewatch.config.json
new file mode 100644
index 000000000000..0576af92f564
--- /dev/null
+++ b/.bundlewatch.config.json
@@ -0,0 +1,50 @@
+{
+ "files": [
+ {
+ "path": "./dist/css/bootstrap-grid.css",
+ "maxSize": "7 kB"
+ },
+ {
+ "path": "./dist/css/bootstrap-grid.min.css",
+ "maxSize": "6.25 kB"
+ },
+ {
+ "path": "./dist/css/bootstrap-reboot.css",
+ "maxSize": "2 kB"
+ },
+ {
+ "path": "./dist/css/bootstrap-reboot.min.css",
+ "maxSize": "2 kB"
+ },
+ {
+ "path": "./dist/css/bootstrap.css",
+ "maxSize": "26 kB"
+ },
+ {
+ "path": "./dist/css/bootstrap.min.css",
+ "maxSize": "23.75 kB"
+ },
+ {
+ "path": "./dist/js/bootstrap.bundle.js",
+ "maxSize": "48 kB"
+ },
+ {
+ "path": "./dist/js/bootstrap.bundle.min.js",
+ "maxSize": "21.75 kB"
+ },
+ {
+ "path": "./dist/js/bootstrap.js",
+ "maxSize": "25.5 kB"
+ },
+ {
+ "path": "./dist/js/bootstrap.min.js",
+ "maxSize": "15 kB"
+ }
+ ],
+ "ci": {
+ "trackBranches": [
+ "main",
+ "v4-dev"
+ ]
+ }
+}
diff --git a/.eslintignore b/.eslintignore
index 96958b2ba864..a18b03a5df54 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,4 +1,6 @@
**/*.min.js
**/dist/
**/vendor/
-/_gh_pages/
+/_site/
+/js/coverage/
+/site/static/sw.js
diff --git a/.eslintrc.json b/.eslintrc.json
index bfd2d333ae60..3d099fc9de80 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -1,233 +1,76 @@
{
"root": true,
- "parser": "babel-eslint",
- "env": {
- "browser": true,
- "es6": true
- },
- "extends": ["eslint:recommended"],
+ "extends": [
+ "plugin:import/errors",
+ "plugin:import/warnings",
+ "plugin:unicorn/recommended",
+ "xo",
+ "xo/browser"
+ ],
"rules": {
- // Possible Errors
- "no-await-in-loop": "error",
- "no-extra-parens": "error",
- "no-prototype-builtins": "error",
- "no-template-curly-in-string": "error",
- "valid-jsdoc": "error",
-
- // Best Practices
- "accessor-pairs": "error",
- "array-callback-return": "error",
- "block-scoped-var": "error",
- "class-methods-use-this": "off",
- "complexity": "error",
- "consistent-return": "error",
- "curly": "error",
- "default-case": "error",
- "dot-location": ["error", "property"],
- "dot-notation": "error",
- "eqeqeq": "error",
- "guard-for-in": "error",
- "no-alert": "error",
- "no-caller": "error",
- "no-div-regex": "error",
- "no-else-return": "error",
- "no-empty-function": "error",
- "no-eq-null": "error",
- "no-eval": "error",
- "no-extend-native": "error",
- "no-extra-bind": "error",
- "no-extra-label": "error",
- "no-floating-decimal": "error",
- "no-implicit-coercion": "error",
- "no-implicit-globals": "error",
- "no-implied-eval": "error",
- "no-invalid-this": "off",
- "no-iterator": "error",
- "no-labels": "error",
- "no-lone-blocks": "error",
- "no-loop-func": "error",
- "no-magic-numbers": ["error", {
- "ignore": [-1, 0, 1],
- "ignoreArrayIndexes": true
+ "arrow-body-style": "off",
+ "capitalized-comments": "off",
+ "comma-dangle": [
+ "error",
+ "never"
+ ],
+ "indent": [
+ "error",
+ 2,
+ {
+ "MemberExpression": "off",
+ "SwitchCase": 1
}
],
- "no-multi-spaces": ["error", {
- "ignoreEOLComments": true,
- "exceptions": {
- "AssignmentExpression": true,
- "ArrowFunctionExpression": true,
- "CallExpression": true,
- "VariableDeclarator": true
- }
+ "max-params": [
+ "warn",
+ 5
+ ],
+ "new-cap": [
+ "error",
+ {
+ "properties": false
}
],
- "no-multi-str": "error",
- "no-new": "error",
- "no-new-func": "error",
- "no-new-wrappers": "error",
- "no-octal-escape": "error",
- "no-param-reassign": "off",
- "no-proto": "error",
- "no-restricted-properties": "error",
- "no-return-assign": "error",
- "no-return-await": "error",
- "no-script-url": "error",
- "no-self-compare": "error",
- "no-sequences": "error",
- "no-throw-literal": "error",
- "no-unmodified-loop-condition": "error",
- "no-unused-expressions": "error",
- "no-useless-call": "error",
- "no-useless-concat": "error",
- "no-useless-return": "error",
- "no-void": "error",
- "no-warning-comments": "off",
- "no-with": "error",
- "prefer-promise-reject-errors": "error",
- "radix": "error",
- "require-await": "error",
- "vars-on-top": "error",
- "wrap-iife": "error",
- "yoda": "error",
-
- // Strict Mode
- "strict": "error",
-
- // Variables
- "init-declarations": "off",
- "no-catch-shadow": "error",
- "no-label-var": "error",
- "no-restricted-globals": "error",
- "no-shadow": "off",
- "no-shadow-restricted-names": "error",
- "no-undef-init": "error",
- "no-undefined": "error",
- "no-use-before-define": "off",
-
- // Node.js and CommonJS
- "callback-return": "off",
- "global-require": "error",
- "handle-callback-err": "error",
- "no-mixed-requires": "error",
- "no-new-require": "error",
- "no-path-concat": "error",
- "no-process-env": "error",
- "no-process-exit": "error",
- "no-restricted-modules": "error",
- "no-sync": "error",
-
- // Stylistic Issues
- "array-bracket-spacing": "error",
- "block-spacing": "error",
- "brace-style": "error",
- "camelcase": "error",
- "capitalized-comments": "off",
- "comma-dangle": "error",
- "comma-spacing": "error",
- "comma-style": "error",
- "computed-property-spacing": "error",
- "consistent-this": "error",
- "eol-last": "error",
- "func-call-spacing": "error",
- "func-name-matching": "error",
- "func-names": "off",
- "func-style": ["error", "declaration"],
- "id-blacklist": "error",
- "id-length": "off",
- "id-match": "error",
- "indent": ["error", 2, { "SwitchCase": 1 }],
- "jsx-quotes": "error",
- "key-spacing": "off",
- "keyword-spacing": "error",
- "linebreak-style": ["error", "unix"],
- "line-comment-position": "off",
- "lines-around-comment": "off",
- "lines-around-directive": "error",
- "max-depth": ["error", 10],
- "max-len": "off",
- "max-lines": "off",
- "max-nested-callbacks": "error",
- "max-params": "off",
- "max-statements": "off",
- "max-statements-per-line": "error",
- "multiline-ternary": "off",
- "new-cap": ["error", { "capIsNewExceptionPattern": "$.*" }],
- "newline-after-var": "off",
- "newline-per-chained-call": ["error", { "ignoreChainWithDepth": 5 }],
- "new-parens": "error",
- "no-array-constructor": "error",
- "no-bitwise": "error",
- "no-continue": "off",
- "no-inline-comments": "off",
- "no-lonely-if": "error",
+ "no-console": "error",
"no-mixed-operators": "off",
- "no-multi-assign": "error",
- "no-multiple-empty-lines": "error",
- "nonblock-statement-body-position": "error",
"no-negated-condition": "off",
- "no-nested-ternary": "error",
- "no-new-object": "error",
- "no-plusplus": "off",
- "no-restricted-syntax": "error",
- "no-tabs": "error",
- "no-ternary": "off",
- "no-trailing-spaces": "error",
- "no-underscore-dangle": "off",
- "no-unneeded-ternary": "error",
- "no-whitespace-before-property": "error",
- "object-curly-newline": ["error", { "minProperties": 1 }],
- "object-curly-spacing": ["error", "always"],
- "object-property-newline": "error",
- "one-var": ["error", "never"],
- "one-var-declaration-per-line": "error",
- "operator-assignment": "error",
- "operator-linebreak": "error",
- "padded-blocks": ["error", "never"],
- "padding-line-between-statements": "off",
- "quote-props": ["error", "as-needed"],
- "quotes": ["error", "single"],
- "require-jsdoc": "off",
- "semi": ["error", "never"],
- "semi-spacing": "error",
- "sort-keys": "off",
- "sort-vars": "error",
- "space-before-blocks": "error",
- "space-before-function-paren": ["error", {
- "anonymous": "always",
- "named": "never"
- }],
- "space-in-parens": "error",
- "space-infix-ops": "error",
- "space-unary-ops": "error",
- "spaced-comment": "error",
- "template-tag-spacing": "error",
- "unicode-bom": "error",
- "wrap-regex": "off",
-
- // ECMAScript 6
- "arrow-body-style": ["error", "as-needed"],
- "arrow-parens": "error",
- "arrow-spacing": "error",
- "generator-star-spacing": "error",
- "no-confusing-arrow": "error",
- "no-duplicate-imports": "error",
- "no-restricted-imports": "error",
- "no-useless-computed-key": "error",
- "no-useless-constructor": "error",
- "no-useless-rename": "error",
- "no-var": "error",
- "object-shorthand": "error",
- "prefer-arrow-callback": "error",
- "prefer-const": "error",
- "prefer-destructuring": "off",
- "prefer-numeric-literals": "error",
- "prefer-rest-params": "error",
- "prefer-spread": "error",
- "prefer-template": "error",
- "rest-spread-spacing": "error",
- "sort-imports": "error",
- "symbol-description": "error",
- "template-curly-spacing": "error",
- "yield-star-spacing": "error"
+ "object-curly-spacing": [
+ "error",
+ "always"
+ ],
+ "operator-linebreak": [
+ "error",
+ "after"
+ ],
+ "semi": [
+ "error",
+ "never"
+ ],
+ "unicorn/consistent-function-scoping": "off",
+ "unicorn/explicit-length-check": "off",
+ "unicorn/no-array-callback-reference": "off",
+ "unicorn/no-array-for-each": "off",
+ "unicorn/no-array-method-this-argument": "off",
+ "unicorn/no-for-loop": "off",
+ "unicorn/no-null": "off",
+ "unicorn/no-unused-properties": "error",
+ "unicorn/no-useless-undefined": "off",
+ "unicorn/numeric-separators-style": "off",
+ "unicorn/prefer-array-find": "off",
+ "unicorn/prefer-array-flat": "off",
+ "unicorn/prefer-dom-node-append": "off",
+ "unicorn/prefer-dom-node-dataset": "off",
+ "unicorn/prefer-dom-node-remove": "off",
+ "unicorn/prefer-includes": "off",
+ "unicorn/prefer-math-trunc": "off",
+ "unicorn/prefer-module": "off",
+ "unicorn/prefer-number-properties": "off",
+ "unicorn/prefer-optional-catch-binding": "off",
+ "unicorn/prefer-prototype-methods": "off",
+ "unicorn/prefer-query-selector": "off",
+ "unicorn/prefer-reflect-apply": "off",
+ "unicorn/prefer-set-has": "off",
+ "unicorn/prevent-abbreviations": "off"
}
}
diff --git a/.gitattributes b/.gitattributes
index 39813c758947..40b1c37421a0 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,18 +1,8 @@
# Enforce Unix newlines
-*.css text eol=lf
-*.html text eol=lf
-*.js text eol=lf
-*.json text eol=lf
-*.md text eol=lf
-*.rb text eol=lf
-*.scss text eol=lf
-*.svg text eol=lf
-*.txt text eol=lf
-*.xml text eol=lf
-*.yml text eol=lf
+* text=auto eol=lf
# Don't diff or textually merge source maps
-*.map binary
+*.map binary
bootstrap.css linguist-vendored=false
bootstrap.js linguist-vendored=false
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index f579111bd41a..c4de33669396 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -18,8 +18,9 @@ the preferred channel for [bug reports](#bug-reports), [features requests](#feat
and [submitting pull requests](#pull-requests), but please respect the following
restrictions:
-* Please **do not** use the issue tracker for personal support requests. Stack
- Overflow ([`bootstrap-4`](https://stackoverflow.com/questions/tagged/bootstrap-4) tag), [Slack](https://bootstrap-slack.herokuapp.com/) or [IRC](README.md#community) are better places to get help.
+* Please **do not** use the issue tracker for personal support requests. Stack
+ Overflow ([`bootstrap-4`](https://stackoverflow.com/questions/tagged/bootstrap-4) tag),
+ [Slack](https://bootstrap-slack.herokuapp.com/) or [IRC](/README.md#community) are better places to get help.
* Please **do not** derail or troll issues. Keep the discussion on topic and
respect the opinions of others.
@@ -57,15 +58,14 @@ Good bug reports are extremely helpful, so thanks!
Guidelines for bug reports:
-0. **Validate and lint your code** — [validate your HTML](https://html5.validator.nu/)
- and [lint your HTML](https://github.com/twbs/bootlint) to ensure your
+0. **[validate your HTML](https://html5.validator.nu/)** to ensure your
problem isn't caused by a simple error in your own code.
1. **Use the GitHub issue search** — check if the issue has already been
reported.
2. **Check if the issue has been fixed** — try to reproduce it using the
- latest `master` or development branch in the repository.
+ latest `master` or `v4-dev` branch in the repository.
3. **Isolate the problem** — ideally create a [reduced test
case](https://css-tricks.com/reduced-test-cases/) and a live example.
@@ -102,16 +102,12 @@ Example:
Sometimes bugs reported to us are actually caused by bugs in the browser(s) themselves, not bugs in Bootstrap per se.
When feasible, we aim to report such upstream bugs to the relevant browser vendor(s), and then list them on our [Wall of Browser Bugs](https://getbootstrap.com/browser-bugs/) and [document them in MDN](https://developer.mozilla.org/en-US/docs/Web).
-| Vendor(s) | Browser(s) | Rendering engine | Bug reporting website(s) | Notes |
-| ------------- | ---------------------------- | ---------------- | ------------------------------------------------------------------------------------- | -------------------------------------------------------- |
-| Mozilla | Firefox | Gecko | https://bugzilla.mozilla.org/enter_bug.cgi | "Core" is normally the right product option to choose. |
-| Apple | Safari | WebKit | https://bugs.webkit.org/enter_bug.cgi?product=WebKit
-
@@ -9,12 +9,12 @@
Sleek, intuitive, and powerful front-end framework for faster and easier web development.
Explore Bootstrap docs » Explore Bootstrap docs » Report bug
+ Report bug
·
- Request feature
+ Request feature
·
Themes
·
@@ -41,38 +41,38 @@
Several quick start options are available:
-- [Download the latest release.](https://github.com/twbs/bootstrap/archive/v4.2.1.zip)
+- [Download the latest release.](https://github.com/twbs/bootstrap/archive/v4.6.2.zip)
- Clone the repo: `git clone https://github.com/twbs/bootstrap.git`
- Install with [npm](https://www.npmjs.com/): `npm install bootstrap`
-- Install with [yarn](https://yarnpkg.com/): `yarn add bootstrap@4.2.1`
-- Install with [Composer](https://getcomposer.org/): `composer require twbs/bootstrap:4.2.1`
+- Install with [yarn](https://yarnpkg.com/): `yarn add bootstrap@4.6.2`
+- Install with [Composer](https://getcomposer.org/): `composer require twbs/bootstrap:4.6.2`
- Install with [NuGet](https://www.nuget.org/): CSS: `Install-Package bootstrap` Sass: `Install-Package bootstrap.sass`
-Read the [Getting started page](https://getbootstrap.com/docs/4.2/getting-started/introduction/) for information on the framework contents, templates and examples, and more.
+Read the [Getting started page](https://getbootstrap.com/docs/4.6/getting-started/introduction/) for information on the framework contents, templates and examples, and more.
## Status
[](https://bootstrap-slack.herokuapp.com/)
-[](https://travis-ci.org/twbs/bootstrap)
-[](https://www.npmjs.com/package/bootstrap)
-[](https://rubygems.org/gems/bootstrap)
-[](https://atmospherejs.com/twbs/bootstrap)
-[](https://packagist.org/packages/twbs/bootstrap)
-[](https://www.nuget.org/packages/bootstrap/absoluteLatest)
-[](https://david-dm.org/twbs/bootstrap?type=peer)
-[](https://david-dm.org/twbs/bootstrap?type=dev)
-[](https://coveralls.io/github/twbs/bootstrap?branch=v4-dev)
-[](https://github.com/twbs/bootstrap/tree/v4-dev/dist/css/bootstrap.min.css)
-[](https://github.com/twbs/bootstrap/tree/v4-dev/dist/js/bootstrap.min.js)
+[](https://github.com/twbs/bootstrap/actions?query=workflow%3AJS+Tests+branch%3Av4-dev)
+[](https://www.npmjs.com/package/bootstrap)
+[](https://rubygems.org/gems/bootstrap)
+[](https://atmospherejs.com/twbs/bootstrap)
+[](https://packagist.org/packages/twbs/bootstrap)
+[](https://www.nuget.org/packages/bootstrap/absoluteLatest)
+[](https://coveralls.io/github/twbs/bootstrap?branch=v4-dev)
+[](https://github.com/twbs/bootstrap/blob/v4-dev/dist/css/bootstrap.min.css)
+[](https://github.com/twbs/bootstrap/blob/v4-dev/dist/js/bootstrap.min.js)
[](https://www.browserstack.com/automate/public-build/SkxZcStBeExEdVJqQ2hWYnlWckpkNmNEY213SFp6WHFETWk2bGFuY3pCbz0tLXhqbHJsVlZhQnRBdEpod3NLSDMzaHc9PQ==--3d0b75245708616eb93113221beece33e680b229)
-[](#backers)
-[](#sponsors)
+[](#backers)
+[](#sponsors)
## What's included
-Within the download you'll find the following directories and files, logically grouping common assets and providing both compiled and minified variations. You'll see something like this:
+Within the download you'll find the following directories and files, logically grouping common assets and providing both compiled and minified variations.
+
+Download contents
```text
bootstrap/
@@ -100,48 +100,45 @@ bootstrap/
├── bootstrap.min.js
└── bootstrap.min.js.map
```
+
-
Thanks to [BrowserStack](https://www.browserstack.com/) for providing the infrastructure that allows us to test in real browsers!
-## Backers
-
-Thank you to all our backers! 🙏 [[Become a backer](https://opencollective.com/bootstrap#backer)]
-
-[](https://opencollective.com/bootstrap#backers)
-
-
## Sponsors
Support this project by becoming a sponsor. Your logo will show up here with a link to your website. [[Become a sponsor](https://opencollective.com/bootstrap#sponsor)]
@@ -208,6 +198,13 @@ Support this project by becoming a sponsor. Your logo will show up here with a l
[](https://opencollective.com/bootstrap/sponsor/9/website)
+## Backers
+
+Thank you to all our backers! 🙏 [[Become a backer](https://opencollective.com/bootstrap#backer)]
+
+[](https://opencollective.com/bootstrap#backers)
+
+
## Copyright and license
-Code and documentation copyright 2011-2018 the [Bootstrap Authors](https://github.com/twbs/bootstrap/graphs/contributors) and [Twitter, Inc.](https://twitter.com) Code released under the [MIT License](https://github.com/twbs/bootstrap/blob/master/LICENSE). Docs released under [Creative Commons](https://github.com/twbs/bootstrap/blob/master/docs/LICENSE).
+Code and documentation copyright 2011-2022 the [Bootstrap Authors](https://github.com/twbs/bootstrap/graphs/contributors) and [Twitter, Inc.](https://twitter.com) Code released under the [MIT License](https://github.com/twbs/bootstrap/blob/main/LICENSE). Docs released under [Creative Commons](https://creativecommons.org/licenses/by/3.0/).
diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 000000000000..e79dcd8d2038
--- /dev/null
+++ b/SECURITY.md
@@ -0,0 +1,7 @@
+# Reporting Security Issues
+
+The Bootstrap team and community take security issues in Bootstrap seriously. We appreciate your efforts to responsibly disclose your findings, and will make every effort to acknowledge your contributions.
+
+To report a security issue, email [security@getbootstrap.com](mailto:security@getbootstrap.com) and include the word "SECURITY" in the subject line.
+
+We'll endeavor to respond quickly, and will keep you updated throughout the process.
diff --git a/_config.yml b/_config.yml
deleted file mode 100644
index 10c4b4a58e40..000000000000
--- a/_config.yml
+++ /dev/null
@@ -1,68 +0,0 @@
-# Dependencies
-markdown: kramdown
-highlighter: rouge
-
-kramdown:
- auto_ids: true
-
-# Permalinks
-permalink: pretty
-
-# Server
-source: "site"
-destination: ./_gh_pages
-host: "localhost"
-port: 9001
-baseurl: ""
-url: "https://getbootstrap.com"
-encoding: UTF-8
-exclude:
- - docs/4.2/assets/scss/
-
-plugins:
- - jekyll-redirect-from
- - jekyll-sitemap
- - jekyll-toc
-
-# Social
-title: Bootstrap
-description: "The most popular HTML, CSS, and JS library in the world."
-twitter: getbootstrap
-authors: "Mark Otto, Jacob Thornton, and Bootstrap contributors"
-social_image_path: /docs/4.2/assets/brand/bootstrap-social.png
-social_logo_path: /docs/4.2/assets/brand/bootstrap-social-logo.png
-
-# Custom variables
-current_version: 4.2.1
-current_ruby_version: 4.2.1
-docs_version: 4.2
-repo: "https://github.com/twbs/bootstrap"
-slack: "https://bootstrap-slack.herokuapp.com"
-opencollective: "https://opencollective.com/bootstrap"
-blog: "https://blog.getbootstrap.com"
-expo: "https://expo.getbootstrap.com"
-themes: "https://themes.getbootstrap.com"
-
-download:
- source: "https://github.com/twbs/bootstrap/archive/v4.2.1.zip"
- dist: "https://github.com/twbs/bootstrap/releases/download/v4.2.1/bootstrap-4.2.1-dist.zip"
-
-cdn:
- # See https://www.srihash.org for info on how to generate the hashes
- css: "https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/css/bootstrap.min.css"
- css_hash: "sha384-GJzZqFGwb1QTTN6wy59ffF1BuGJpLSa9DkKMp0DgiMDm4iYMj70gZWKYbI706tWS"
- js: "https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/js/bootstrap.min.js"
- js_hash: "sha384-B0UglyR+jN6CkvvICOB2joaf5I4l3gm9GU6Hc1og6Ls7i6U/mkkaduKaBhlAXv9k"
- js_bundle: "https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/js/bootstrap.bundle.min.js"
- js_bundle_hash: "sha384-zDnhMsjVZfS3hiP7oCBRmfjkQC4fzxVxFhBx8Hkz2aZX8gEvA/jsP3eXRCvzTofP"
- jquery: "https://code.jquery.com/jquery-3.3.1.slim.min.js"
- jquery_hash: "sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo"
- popper: "https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.6/umd/popper.min.js"
- popper_hash: "sha384-wHAiFfRlMFy6i5SRaxvfOCifBUQy1xHdJ/yoi7FRNXMRBu5WHdZYu1hA6ZOblgut"
-
-toc:
- min_level: 2
- max_level: 4
- no_toc_section_class:
- - "bd-callout"
- - "bd-example"
diff --git a/build/.eslintrc.json b/build/.eslintrc.json
index 76e7f37b6348..679bd26f7ba2 100644
--- a/build/.eslintrc.json
+++ b/build/.eslintrc.json
@@ -8,13 +8,7 @@
},
"extends": "../.eslintrc.json",
"rules": {
- "consistent-return": "off",
- "func-style": "off",
"no-console": "off",
- "no-magic-numbers": "off",
- "no-process-env": "off",
- "no-process-exit": "off",
- "no-sync": "off",
- "spaced-comment": "off"
+ "strict": "error"
}
}
diff --git a/build/banner.js b/build/banner.js
index 453fc3b6e0b2..df82ff32edf3 100644
--- a/build/banner.js
+++ b/build/banner.js
@@ -7,7 +7,7 @@ function getBanner(pluginFilename) {
return `/*!
* Bootstrap${pluginFilename ? ` ${pluginFilename}` : ''} v${pkg.version} (${pkg.homepage})
* Copyright 2011-${year} ${pkg.author}
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/`
}
diff --git a/build/build-plugins.js b/build/build-plugins.js
index 3240ee5d0538..9e33ddb655c6 100644
--- a/build/build-plugins.js
+++ b/build/build-plugins.js
@@ -1,28 +1,26 @@
+#!/usr/bin/env node
+
/*!
* Script to build our plugins to use them separately.
- * Copyright 2018 The Bootstrap Authors
- * Copyright 2018 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * Copyright 2020-2022 The Bootstrap Authors
+ * Copyright 2020-2022 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/
'use strict'
-const path = require('path')
-const rollup = require('rollup')
-const babel = require('rollup-plugin-babel')
-const banner = require('./banner.js')
+const path = require('path')
+const rollup = require('rollup')
+const { babel } = require('@rollup/plugin-babel')
+const banner = require('./banner.js')
-const TEST = process.env.NODE_ENV === 'test'
+const TEST = process.env.NODE_ENV === 'test'
const plugins = [
babel({
- exclude: 'node_modules/**', // Only transpile our source code
- externalHelpersWhitelist: [ // Include only required helpers
- 'defineProperties',
- 'createClass',
- 'inheritsLoose',
- 'defineProperty',
- 'objectSpread'
- ]
+ // Only transpile our source code
+ exclude: 'node_modules/**',
+ // Include the helpers in each file, at most one copy of each
+ babelHelpers: 'bundled'
})
]
const bsPlugins = {
@@ -41,7 +39,7 @@ const bsPlugins = {
}
const rootPath = TEST ? '../js/coverage/dist/' : '../js/dist/'
-function build(plugin) {
+const build = async plugin => {
console.log(`Building ${plugin} plugin...`)
const external = ['jquery', 'popper.js']
@@ -63,23 +61,32 @@ function build(plugin) {
}
const pluginFilename = `${plugin.toLowerCase()}.js`
-
- rollup.rollup({
+ const bundle = await rollup.rollup({
input: bsPlugins[plugin],
plugins,
external
- }).then((bundle) => {
- bundle.write({
- banner: banner(pluginFilename),
- format: 'umd',
- name: plugin,
- sourcemap: true,
- globals,
- file: path.resolve(__dirname, `${rootPath}${pluginFilename}`)
- })
- .then(() => console.log(`Building ${plugin} plugin... Done!`))
- .catch((err) => console.error(`${plugin}: ${err}`))
})
+
+ await bundle.write({
+ banner: banner(pluginFilename),
+ format: 'umd',
+ name: plugin,
+ sourcemap: true,
+ globals,
+ file: path.resolve(__dirname, `${rootPath}${pluginFilename}`)
+ })
+
+ console.log(`Building ${plugin} plugin... Done!`)
+}
+
+const main = async () => {
+ try {
+ await Promise.all(Object.keys(bsPlugins).map(plugin => build(plugin)))
+ } catch (error) {
+ console.error(error)
+
+ process.exit(1)
+ }
}
-Object.keys(bsPlugins).forEach((plugin) => build(plugin))
+main()
diff --git a/build/change-version.js b/build/change-version.js
old mode 100755
new mode 100644
index 7102dc0830d2..e035eba952ea
--- a/build/change-version.js
+++ b/build/change-version.js
@@ -2,103 +2,80 @@
/*!
* Script to update version number references in the project.
- * Copyright 2017-2018 The Bootstrap Authors
- * Copyright 2017-2018 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * Copyright 2017-2022 The Bootstrap Authors
+ * Copyright 2017-2022 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/
'use strict'
-const fs = require('fs')
+const fs = require('fs').promises
const path = require('path')
-const sh = require('shelljs')
+const globby = require('globby')
-sh.config.fatal = true
+const VERBOSE = process.argv.includes('--verbose')
+const DRY_RUN = process.argv.includes('--dry') || process.argv.includes('--dry-run')
+
+// These are the filetypes we only care about replacing the version
+const GLOB = [
+ '**/*.{css,html,js,json,md,scss,txt,yml}'
+]
+const GLOBBY_OPTIONS = {
+ cwd: path.join(__dirname, '..'),
+ gitignore: true
+}
// Blame TC39... https://github.com/benjamingr/RegExp.escape/issues/37
function regExpQuote(string) {
- return string.replace(/[-\\^$*+?.()|[\]{}]/g, '\\$&')
+ return string.replace(/[$()*+.?[\\\]^{|}-]/g, '\\$&')
}
function regExpQuoteReplacement(string) {
- return string.replace(/[$]/g, '$$')
+ return string.replace(/\$/g, '$$')
}
-const DRY_RUN = false
+async function replaceRecursively(file, oldVersion, newVersion) {
+ const originalString = await fs.readFile(file, 'utf8')
+ const newString = originalString.replace(
+ new RegExp(regExpQuote(oldVersion), 'g'), regExpQuoteReplacement(newVersion)
+ )
-function walkAsync(directory, excludedDirectories, fileCallback, errback) {
- if (excludedDirectories.has(path.parse(directory).base)) {
+ // No need to move any further if the strings are identical
+ if (originalString === newString) {
return
}
- fs.readdir(directory, (err, names) => {
- if (err) {
- errback(err)
- return
- }
- names.forEach((name) => {
- const filepath = path.join(directory, name)
- fs.lstat(filepath, (err, stats) => {
- if (err) {
- process.nextTick(errback, err)
- return
- }
- if (stats.isDirectory()) {
- process.nextTick(walkAsync, filepath, excludedDirectories, fileCallback, errback)
- } else if (stats.isFile()) {
- process.nextTick(fileCallback, filepath)
- }
- })
- })
- })
-}
-function replaceRecursively(directory, excludedDirectories, allowedExtensions, original, replacement) {
- original = new RegExp(regExpQuote(original), 'g')
- replacement = regExpQuoteReplacement(replacement)
- const updateFile = DRY_RUN ? (filepath) => {
- if (allowedExtensions.has(path.parse(filepath).ext)) {
- console.log(`FILE: ${filepath}`)
- } else {
- console.log(`EXCLUDED:${filepath}`)
- }
- } : (filepath) => {
- if (allowedExtensions.has(path.parse(filepath).ext)) {
- sh.sed('-i', original, replacement, filepath)
- }
+ if (VERBOSE) {
+ console.log(`FILE: ${file}`)
}
- walkAsync(directory, excludedDirectories, updateFile, (err) => {
- console.error('ERROR while traversing directory!:')
- console.error(err)
- process.exit(1)
- })
+
+ if (DRY_RUN) {
+ return
+ }
+
+ await fs.writeFile(file, newString, 'utf8')
}
-function main(args) {
- if (args.length !== 2) {
- console.error('USAGE: change-version old_version new_version')
+async function main(args) {
+ let [oldVersion, newVersion] = args
+
+ if (!oldVersion || !newVersion) {
+ console.error('USAGE: change-version old_version new_version [--verbose] [--dry[-run]]')
console.error('Got arguments:', args)
process.exit(1)
}
- const oldVersion = args[0]
- const newVersion = args[1]
- const EXCLUDED_DIRS = new Set([
- '.git',
- 'node_modules',
- 'vendor'
- ])
- const INCLUDED_EXTENSIONS = new Set([
- // This extension whitelist is how we avoid modifying binary files
- '',
- '.css',
- '.html',
- '.js',
- '.json',
- '.md',
- '.scss',
- '.txt',
- '.yml'
- ])
- replaceRecursively('.', EXCLUDED_DIRS, INCLUDED_EXTENSIONS, oldVersion, newVersion)
+
+ // Strip any leading `v` from arguments because otherwise we will end up with duplicate `v`s
+ [oldVersion, newVersion] = [oldVersion, newVersion].map(arg => arg.startsWith('v') ? arg.slice(1) : arg)
+
+ try {
+ const files = await globby(GLOB, GLOBBY_OPTIONS)
+
+ await Promise.all(files.map(file => replaceRecursively(file, oldVersion, newVersion)))
+ } catch (error) {
+ console.error(error)
+ process.exit(1)
+ }
}
main(process.argv.slice(2))
diff --git a/build/generate-sri.js b/build/generate-sri.js
index 309f29bd287b..9685899261f8 100644
--- a/build/generate-sri.js
+++ b/build/generate-sri.js
@@ -5,9 +5,9 @@
* Remember to use the same vendor files as the CDN ones,
* otherwise the hashes won't match!
*
- * Copyright 2017-2018 The Bootstrap Authors
- * Copyright 2017-2018 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * Copyright 2017-2022 The Bootstrap Authors
+ * Copyright 2017-2022 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/
'use strict'
@@ -21,11 +21,11 @@ const pkg = require('../package.json')
sh.config.fatal = true
-const configFile = path.join(__dirname, '../_config.yml')
+const configFile = path.join(__dirname, '../config.yml')
// Array of objects which holds the files to generate SRI hashes for.
// `file` is the path from the root folder
-// `configPropertyName` is the _config.yml variable's name of the file
+// `configPropertyName` is the config.yml variable's name of the file
const files = [
{
file: 'dist/css/bootstrap.min.css',
@@ -35,21 +35,21 @@ const files = [
file: 'dist/js/bootstrap.min.js',
configPropertyName: 'js_hash'
},
- {
- file: `site/docs/${pkg.version_short}/assets/js/vendor/jquery-slim.min.js`,
- configPropertyName: 'jquery_hash'
- },
{
file: 'dist/js/bootstrap.bundle.min.js',
configPropertyName: 'js_bundle_hash'
},
+ {
+ file: `site/static/docs/${pkg.config.version_short}/assets/js/vendor/jquery.slim.min.js`,
+ configPropertyName: 'jquery_hash'
+ },
{
file: 'node_modules/popper.js/dist/umd/popper.min.js',
configPropertyName: 'popper_hash'
}
]
-files.forEach((file) => {
+files.forEach(file => {
fs.readFile(file.file, 'utf8', (err, data) => {
if (err) {
throw err
@@ -61,6 +61,6 @@ files.forEach((file) => {
console.log(`${file.configPropertyName}: ${integrity}`)
- sh.sed('-i', new RegExp(`(\\s${file.configPropertyName}:\\s+"|')(\\S+)("|')`), `$1${integrity}$3`, configFile)
+ sh.sed('-i', new RegExp(`^(\\s+${file.configPropertyName}:\\s+["'])\\S*(["'])`), `$1${integrity}$2`, configFile)
})
})
diff --git a/build/postcss.config.js b/build/postcss.config.js
index 157291ffd2e2..ef416258f7fc 100644
--- a/build/postcss.config.js
+++ b/build/postcss.config.js
@@ -1,14 +1,18 @@
'use strict'
-module.exports = (ctx) => ({
- map: ctx.file.dirname.includes('examples') ? false : {
- inline: false,
- annotation: true,
- sourcesContent: true
- },
- plugins: {
- autoprefixer: {
- cascade: false
+module.exports = ctx => {
+ return {
+ map: ctx.file.dirname.includes('examples') ?
+ false :
+ {
+ inline: false,
+ annotation: true,
+ sourcesContent: true
+ },
+ plugins: {
+ autoprefixer: {
+ cascade: false
+ }
}
}
-})
+}
diff --git a/build/rollup.config.js b/build/rollup.config.js
index e81a07ef58b2..e2d2b125efe6 100644
--- a/build/rollup.config.js
+++ b/build/rollup.config.js
@@ -1,24 +1,20 @@
'use strict'
-const path = require('path')
-const babel = require('rollup-plugin-babel')
-const resolve = require('rollup-plugin-node-resolve')
-const banner = require('./banner.js')
+const path = require('path')
+const { babel } = require('@rollup/plugin-babel')
+const { nodeResolve } = require('@rollup/plugin-node-resolve')
+const banner = require('./banner.js')
-const BUNDLE = process.env.BUNDLE === 'true'
+const BUNDLE = process.env.BUNDLE === 'true'
-let fileDest = 'bootstrap.js'
+let fileDest = 'bootstrap.js'
const external = ['jquery', 'popper.js']
const plugins = [
babel({
- exclude: 'node_modules/**', // Only transpile our source code
- externalHelpersWhitelist: [ // Include only required helpers
- 'defineProperties',
- 'createClass',
- 'inheritsLoose',
- 'defineProperty',
- 'objectSpread'
- ]
+ // Only transpile our source code
+ exclude: 'node_modules/**',
+ // Include the helpers in the bundle, at most one copy of each
+ babelHelpers: 'bundled'
})
]
const globals = {
@@ -31,11 +27,11 @@ if (BUNDLE) {
// Remove last entry in external array to bundle Popper
external.pop()
delete globals['popper.js']
- plugins.push(resolve())
+ plugins.push(nodeResolve())
}
module.exports = {
- input: path.resolve(__dirname, '../js/src/index.js'),
+ input: path.resolve(__dirname, '../js/index.js'),
output: {
banner,
file: path.resolve(__dirname, `../dist/js/${fileDest}`),
diff --git a/build/ship.sh b/build/ship.sh
deleted file mode 100755
index 2892843839cd..000000000000
--- a/build/ship.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/usr/bin/env bash
-#
-# Usage
-# ---------------
-# 1. Clone second version of Bootstrap in sibling directory named `bs-docs`.
-# 2. Within `bs-docs` copy, switch to `gh-pages` branch.
-# 3. Pull latest, re-bundle, re-npm.
-# 4. Run script.
-
-red=$'\e[1;31m'
-green=$'\e[1;32m'
-#blue=$'\e[1;34m'
-magenta=$'\e[1;35m'
-#cyan=$'\e[1;36m'
-end=$'\e[0m'
-
-# Get current version from package.json
-current_version=$(node -p "require('./package.json').version")
-
-if [[ $# -lt 1 ]]; then
- printf "\n%s⚠️ Shipping aborted. You must specify a version.\n%s" $red $end
- exit 1
-fi
-
-# Pulling latest changes, just to be sure
-printf "\n%s=======================================================%s" $magenta $end
-printf "\n%sPulling latest changes...%s" $magenta $end
-printf "\n%s=======================================================\n\n%s" $magenta $end
-git pull origin v4-dev
-
-# Update version number
-printf "\n%s=======================================================%s" $magenta $end
-printf "\n%sUpdating version number...%s" $magenta $end
-printf "\n%s=======================================================\n%s" $magenta $end
-npm run release-version "$current_version" "$1"
-
-# Build release
-printf "\n%s=======================================================%s" $magenta $end
-printf "\n%sBuilding release...%s" $magenta $end
-printf "\n%s=======================================================\n%s" $magenta $end
-npm run release
-
-# Copy the contents of the built docs site over to `bs-docs` repo
-printf "\n%s=======================================================%s" $magenta $end
-printf "\n%sCopy it over...%s" $magenta $end
-printf "\n%s=======================================================\n%s" $magenta $end
-cp -rf _gh_pages/. ../bs-docs/
-printf "\nDone!\n"
-
-printf "\n%s=======================================================%s" $green $end
-printf "\n%sSuccess, $1 is ready to review and publish.%s" $green $end
-printf "\n%s=======================================================\n\n%s" $green $end
diff --git a/build/svgo.yml b/build/svgo.yml
deleted file mode 100644
index 047e6947f0ce..000000000000
--- a/build/svgo.yml
+++ /dev/null
@@ -1,57 +0,0 @@
-# Usage:
-# install svgo globally: `npm i -g svgo`
-# svgo --config=build/svgo.yml --input=foo.svg
-
-# https://github.com/svg/svgo/blob/master/docs/how-it-works/en.md
-# replace default config
-
-multipass: true
-#full: true
-
-# https://github.com/svg/svgo/blob/master/lib/svgo/js2svg.js#L6 for more config options
-
-js2svg:
- pretty: true
- indent: 2
-
-plugins:
- # remove this with IE 11 is no longer supported
- - addAttributesToSVGElement:
- attributes:
- - focusable: false
- - cleanupAttrs: true
- - cleanupEnableBackground: true
- - cleanupIDs: true
- - cleanupListOfValues: true
- - cleanupNumericValues: true
- - collapseGroups: true
- - convertColors: true
- - convertPathData: true
- - convertShapeToPath: true
- - convertStyleToAttrs: true
- - convertTransform: true
- - inlineStyles: true
- - mergePaths: true
- - minifyStyles: true
- - moveElemsAttrsToGroup: true
- - moveGroupAttrsToElems: true
- - removeComments: true
- - removeDesc: true
- - removeDoctype: true
- - removeEditorsNSData: true
- - removeEmptyAttrs: true
- - removeEmptyContainers: true
- - removeEmptyText: true
- - removeHiddenElems: true
- - removeMetadata: true
- - removeNonInheritableGroupAttrs: true
- - removeTitle: false
- - removeUnknownsAndDefaults:
- keepRoleAttr: true
- - removeUnusedNS: true
- - removeUselessDefs: true
- - removeUselessStrokeAndFill: true
- - removeViewBox: false
- - removeXMLNS: false
- - removeXMLProcInst: true
- - sortAttrs: true
diff --git a/build/vnu-jar.js b/build/vnu-jar.js
index b990ba7b78ed..54a71d024f41 100644
--- a/build/vnu-jar.js
+++ b/build/vnu-jar.js
@@ -2,53 +2,48 @@
/*!
* Script to run vnu-jar if Java is available.
- * Copyright 2017-2018 The Bootstrap Authors
- * Copyright 2017-2018 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * Copyright 2017-2022 The Bootstrap Authors
+ * Copyright 2017-2022 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/
'use strict'
-const childProcess = require('child_process')
+const { execFile, spawn } = require('child_process')
const vnu = require('vnu-jar')
-childProcess.exec('java -version', (error, stdout, stderr) => {
+execFile('java', ['-version'], (error, stdout, stderr) => {
if (error) {
console.error('Skipping vnu-jar test; Java is missing.')
return
}
- const is32bitJava = !stderr.match(/64-Bit/)
+ const is32bitJava = !/64-Bit/.test(stderr)
// vnu-jar accepts multiple ignores joined with a `|`.
- // Also note that the ignores are regular expressions.
+ // Also note that the ignores are string regular expressions.
const ignores = [
// "autocomplete" is included in and checkboxes and radio element in most browsers
- 'Element “legend” not allowed as child of element “div” in this context.*',
- // Content → Reboot uses various date/time inputs as a visual example.
- // Documentation does not rely on them being usable.
- 'The “date” input type is not supported in all browsers.*',
- 'The “time” input type is not supported in all browsers.*',
// IE11 doesn't recognise / give the element an implicit "main" landmark.
// Explicit role="main" is redundant for other modern browsers, but still valid.
'The “main” role is unnecessary for element “main”.',
- // Ignore the wrong lanuage code warnings for now; they happen randomly.
- 'This document appears to be written in.*'
+ // Per https://www.w3.org/TR/html-aria/#docconformance having "aria-disabled" on a link is
+ // NOT RECOMMENDED, but it's still valid - we explain in the docs that it's not ideal,
+ // and offer more robust alternatives, but also need to show a less-than-ideal example
+ 'An “aria-disabled” attribute whose value is “true” should not be specified on an “a” element that has an “href” attribute.'
].join('|')
const args = [
'-jar',
- vnu,
+ `"${vnu}"`,
'--asciiquotes',
'--skip-non-html',
'--Werror',
`--filterpattern "${ignores}"`,
- '_gh_pages/',
+ '_site/',
'js/tests/'
]
@@ -57,7 +52,7 @@ childProcess.exec('java -version', (error, stdout, stderr) => {
args.splice(0, 0, '-Xss512k')
}
- return childProcess.spawn('java', args, {
+ return spawn('java', args, {
shell: true,
stdio: 'inherit'
})
diff --git a/build/zip-examples.js b/build/zip-examples.js
new file mode 100644
index 000000000000..a55b4dfa074a
--- /dev/null
+++ b/build/zip-examples.js
@@ -0,0 +1,88 @@
+#!/usr/bin/env node
+
+/*!
+ * Script to create the built examples zip archive;
+ * requires the `zip` command to be present!
+ * Copyright 2020-2022 The Bootstrap Authors
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
+ */
+
+'use strict'
+
+const path = require('path')
+const sh = require('shelljs')
+
+const pkg = require('../package.json')
+
+const versionShort = pkg.config.version_short
+const distFolder = `bootstrap-${pkg.version}-examples`
+const rootDocsDir = '_site'
+const docsDir = `${rootDocsDir}/docs/${versionShort}/`
+
+// these are the files we need in the examples
+const cssFiles = [
+ 'bootstrap.min.css',
+ 'bootstrap.min.css.map'
+]
+const jsFiles = [
+ 'bootstrap.bundle.min.js',
+ 'bootstrap.bundle.min.js.map'
+]
+const imgFiles = [
+ 'bootstrap-outline.svg',
+ 'bootstrap-solid.svg'
+]
+
+sh.config.fatal = true
+
+if (!sh.test('-d', rootDocsDir)) {
+ throw new Error(`The "${rootDocsDir}" folder does not exist, did you forget building the docs?`)
+}
+
+// switch to the root dir
+sh.cd(path.join(__dirname, '..'))
+
+// remove any previously created folder/zip with the same name
+sh.rm('-rf', [distFolder, `${distFolder}.zip`])
+
+// create any folders so that `cp` works
+sh.mkdir('-p', [
+ distFolder,
+ `${distFolder}/assets/brand/`,
+ `${distFolder}/assets/dist/css/`,
+ `${distFolder}/assets/dist/js/`
+])
+
+sh.cp('-Rf', `${docsDir}/examples/*`, distFolder)
+
+cssFiles.forEach(file => {
+ sh.cp('-f', `${docsDir}/dist/css/${file}`, `${distFolder}/assets/dist/css/`)
+})
+
+jsFiles.forEach(file => {
+ sh.cp('-f', `${docsDir}/dist/js/${file}`, `${distFolder}/assets/dist/js/`)
+})
+
+imgFiles.forEach(file => {
+ sh.cp('-f', `${docsDir}/assets/brand/${file}`, `${distFolder}/assets/brand/`)
+})
+
+sh.rm(`${distFolder}/index.html`)
+
+// get all examples' HTML files
+sh.find(`${distFolder}/**/*.html`).forEach(file => {
+ const fileContents = sh.cat(file)
+ .toString()
+ .replace(new RegExp(`"/docs/${versionShort}/`, 'g'), '"../')
+ .replace(/"..\/dist\//g, '"../assets/dist/')
+ .replace(/(
Hello, world!
-
-
+
+
Util.getUID:
@@ -29,21 +29,21 @@
Hello, world!
-
+
First slide label
Nulla vitae elit libero, a pharetra augue mollis interdum.
-
+
Second slide label
Lorem ipsum dolor sit amet, consectetur adipiscing elit.
-
+
Third slide label
Praesent commodo cursus magna, vel scelerisque nisl consectetur.
diff --git a/js/tests/integration/rollup.bundle.js b/js/tests/integration/rollup.bundle.js
index 783cc2ba05eb..7e6f662cd685 100644
--- a/js/tests/integration/rollup.bundle.js
+++ b/js/tests/integration/rollup.bundle.js
@@ -1,8 +1,8 @@
/* eslint-env node */
-const resolve = require('rollup-plugin-node-resolve')
-const commonjs = require('rollup-plugin-commonjs')
-const babel = require('rollup-plugin-babel')
+const commonjs = require('@rollup/plugin-commonjs')
+const { babel } = require('@rollup/plugin-babel')
+const { nodeResolve } = require('@rollup/plugin-node-resolve')
module.exports = {
input: 'js/tests/integration/bundle.js',
@@ -11,10 +11,11 @@ module.exports = {
format: 'iife'
},
plugins: [
- resolve(),
+ nodeResolve(),
commonjs(),
babel({
- exclude: 'node_modules/**'
+ exclude: 'node_modules/**',
+ babelHelpers: 'bundled'
})
]
}
diff --git a/js/tests/karma.conf.js b/js/tests/karma.conf.js
index 06046ca8e439..341db2428574 100644
--- a/js/tests/karma.conf.js
+++ b/js/tests/karma.conf.js
@@ -1,18 +1,17 @@
/* eslint-env node */
-/* eslint no-process-env: 0 */
-const ip = require('ip')
-const pkg = require('../../package.json')
-const {
- browsers,
- browsersKeys
-} = require('./browsers')
+'use strict'
+
const path = require('path')
-const jsCoveragePath = path.resolve(__dirname, '../coverage')
+const ip = require('ip')
+const { browsers, browsersKeys } = require('./browsers')
-const jqueryFile = process.env.USE_OLD_JQUERY ? 'https://code.jquery.com/jquery-1.9.1.min.js' : `site/docs/${pkg.version_short}/assets/js/vendor/jquery-slim.min.js`
-const bundle = process.env.BUNDLE === 'true'
-const browserStack = process.env.BROWSER === 'true'
+const USE_OLD_JQUERY = Boolean(process.env.USE_OLD_JQUERY)
+const BUNDLE = Boolean(process.env.BUNDLE)
+const BROWSERSTACK = Boolean(process.env.BROWSERSTACK)
+const JQUERY_FILE = USE_OLD_JQUERY ?
+ 'https://cdn.jsdelivr.net/npm/jquery@1.9.1/jquery.min.js' :
+ 'node_modules/jquery/dist/jquery.slim.min.js'
const frameworks = [
'qunit',
@@ -29,22 +28,24 @@ const reporters = ['dots']
const detectBrowsers = {
usePhantomJS: false,
postDetection(availableBrowser) {
- if (typeof process.env.TRAVIS_JOB_ID !== 'undefined' || availableBrowser.includes('Chrome')) {
+ // On CI just use Chrome
+ if (process.env.CI === true) {
+ return ['ChromeHeadless']
+ }
+
+ if (availableBrowser.includes('Chrome')) {
return ['ChromeHeadless']
}
+ if (availableBrowser.includes('Chromium')) {
+ return ['ChromiumHeadless']
+ }
+
if (availableBrowser.includes('Firefox')) {
return ['FirefoxHeadless']
}
- throw new Error('Please install Firefox or Chrome')
- }
-}
-
-const customLaunchers = {
- FirefoxHeadless: {
- base: 'Firefox',
- flags: ['-headless']
+ throw new Error('Please install Chrome, Chromium or Firefox')
}
}
@@ -67,25 +68,23 @@ const conf = {
}
}
-if (bundle) {
+if (BUNDLE) {
frameworks.push('detectBrowsers')
plugins.push(
'karma-chrome-launcher',
'karma-firefox-launcher',
'karma-detect-browsers'
)
- conf.customLaunchers = customLaunchers
conf.detectBrowsers = detectBrowsers
- files = files.concat([
- jqueryFile,
- 'dist/js/bootstrap.js'
- ])
-} else if (browserStack) {
+ files = [...files,
+ JQUERY_FILE,
+ 'dist/js/bootstrap.js']
+} else if (BROWSERSTACK) {
conf.hostname = ip.address()
conf.browserStack = {
username: process.env.BROWSER_STACK_USERNAME,
accessKey: process.env.BROWSER_STACK_ACCESS_KEY,
- build: `bootstrap-${new Date().toISOString()}`,
+ build: `bootstrap-v4-${new Date().toISOString()}`,
project: 'Bootstrap',
retryLimit: 2
}
@@ -93,39 +92,40 @@ if (bundle) {
conf.customLaunchers = browsers
conf.browsers = browsersKeys
reporters.push('BrowserStack')
- files = files.concat([
- `site/docs/${pkg.version_short}/assets/js/vendor/jquery-slim.min.js`,
+ files = [...files,
+ 'node_modules/jquery/dist/jquery.slim.min.js',
'js/dist/util.js',
'js/dist/tooltip.js',
- 'js/dist/!(util|index|tooltip).js' // include all of our js/dist files except util.js, index.js and tooltip.js
- ])
+ // include all of our js/dist files except util.js, index.js and tooltip.js
+ 'js/dist/!(util|index|tooltip).js']
} else {
frameworks.push('detectBrowsers')
plugins.push(
'karma-chrome-launcher',
'karma-firefox-launcher',
- 'karma-detect-browsers',
- 'karma-coverage-istanbul-reporter'
+ 'karma-detect-browsers'
)
- files = files.concat([
- jqueryFile,
+ files = [...files,
+ JQUERY_FILE,
'js/coverage/dist/util.js',
'js/coverage/dist/tooltip.js',
- 'js/coverage/dist/!(util|index|tooltip).js' // include all of our js/dist files except util.js, index.js and tooltip.js
- ])
- reporters.push('coverage-istanbul')
- conf.customLaunchers = customLaunchers
+ // include all of our js/dist files except util.js, index.js and tooltip.js
+ 'js/coverage/dist/!(util|index|tooltip).js']
conf.detectBrowsers = detectBrowsers
- conf.coverageIstanbulReporter = {
- dir: jsCoveragePath,
- reports: ['lcov', 'text-summary'],
- thresholds: {
- emitWarning: false,
- global: {
- statements: 90,
- branches: 86,
- functions: 89,
- lines: 90
+ if (!USE_OLD_JQUERY) {
+ plugins.push('karma-coverage-istanbul-reporter')
+ reporters.push('coverage-istanbul')
+ conf.coverageIstanbulReporter = {
+ dir: path.resolve(__dirname, '../coverage/'),
+ reports: ['lcov', 'text-summary'],
+ thresholds: {
+ emitWarning: false,
+ global: {
+ statements: 90,
+ branches: 86,
+ functions: 89,
+ lines: 90
+ }
}
}
}
@@ -138,8 +138,7 @@ conf.plugins = plugins
conf.reporters = reporters
conf.files = files
-module.exports = (karmaConfig) => {
- // possible values: karmaConfig.LOG_DISABLE || karmaConfig.LOG_ERROR || karmaConfig.LOG_WARN || karmaConfig.LOG_INFO || karmaConfig.LOG_DEBUG
- conf.logLevel = karmaConfig.LOG_ERROR || karmaConfig.LOG_WARN
+module.exports = karmaConfig => {
+ conf.logLevel = karmaConfig.LOG_ERROR
karmaConfig.set(conf)
}
diff --git a/js/tests/unit/.eslintrc.json b/js/tests/unit/.eslintrc.json
index 86d851ad06d0..3153849cf0b8 100644
--- a/js/tests/unit/.eslintrc.json
+++ b/js/tests/unit/.eslintrc.json
@@ -1,4 +1,12 @@
{
+ "extends": [
+ "../../../.eslintrc.json",
+ "plugin:qunit/recommended"
+ ],
+ "parserOptions": {
+ "ecmaVersion": 5,
+ "sourceType": "script"
+ },
"env": {
"es6": false,
"jquery": true,
@@ -14,27 +22,13 @@
"Simulator": false,
"Toast": false
},
- "parserOptions": {
- "ecmaVersion": 5,
- "sourceType": "script"
- },
- "extends": "../../../.eslintrc.json",
"rules": {
- "no-console": "error",
- // Best Practices
- "consistent-return": "off",
- "no-magic-numbers": "off",
- "vars-on-top": "off",
-
- // Stylistic Issues
- "func-style": "off",
- "spaced-comment": "off",
-
- // ECMAScript 6
"no-var": "off",
"object-shorthand": "off",
"prefer-arrow-callback": "off",
+ "prefer-rest-params": "off",
"prefer-template": "off",
- "prefer-rest-params": "off"
+ "unicorn/prefer-add-event-listener": "off",
+ "unicorn/prefer-spread": "off"
}
}
diff --git a/js/tests/unit/alert.js b/js/tests/unit/alert.js
index 65a8f9e76754..990905fc3724 100644
--- a/js/tests/unit/alert.js
+++ b/js/tests/unit/alert.js
@@ -1,6 +1,8 @@
$(function () {
'use strict'
+ window.Alert = typeof bootstrap !== 'undefined' ? bootstrap.Alert : Alert
+
QUnit.module('alert plugin')
QUnit.test('should be defined on jquery object', function (assert) {
@@ -29,7 +31,7 @@ $(function () {
assert.expect(2)
var $el = $('
')
var $alert = $el.bootstrapAlert()
- assert.ok($alert instanceof $, 'returns jquery collection')
+ assert.true($alert instanceof $, 'returns jquery collection')
assert.strictEqual($alert[0], $el[0], 'collection contains element')
})
@@ -44,7 +46,7 @@ $(function () {
$alert.find('.close').trigger('click')
- assert.strictEqual($alert.hasClass('show'), false, 'remove .show class on .close click')
+ assert.false($alert.hasClass('show'), 'remove .show class on .close click')
})
QUnit.test('should remove element when clicking .close', function (assert) {
@@ -56,7 +58,7 @@ $(function () {
'
'
var $alert = $(alertHTML).appendTo('#qunit-fixture').bootstrapAlert()
- assert.notEqual($('#qunit-fixture').find('.alert').length, 0, 'element added to dom')
+ assert.notStrictEqual($('#qunit-fixture').find('.alert').length, 0, 'element added to dom')
$alert
.one('closed.bs.alert', function () {
@@ -104,20 +106,16 @@ $(function () {
var $el = $('
')
var $alert = $el.bootstrapAlert()
- assert.ok(typeof $alert.data('bs.alert') !== 'undefined')
+ assert.notStrictEqual(typeof $alert.data('bs.alert'), 'undefined')
$alert.data('bs.alert').dispose()
- assert.ok(typeof $alert.data('bs.button') === 'undefined')
+ assert.strictEqual(typeof $alert.data('bs.button'), 'undefined')
})
QUnit.test('should return alert version', function (assert) {
assert.expect(1)
- if (typeof Alert !== 'undefined') {
- assert.ok(typeof Alert.VERSION === 'string')
- } else {
- assert.notOk()
- }
+ assert.strictEqual(typeof Alert.VERSION, 'string')
})
})
diff --git a/js/tests/unit/button.js b/js/tests/unit/button.js
index 724545a532e6..cb0d5d70d7dc 100644
--- a/js/tests/unit/button.js
+++ b/js/tests/unit/button.js
@@ -1,6 +1,8 @@
$(function () {
'use strict'
+ window.Button = typeof bootstrap !== 'undefined' ? bootstrap.Button : Button
+
QUnit.module('button plugin')
QUnit.test('should be defined on jquery object', function (assert) {
@@ -29,16 +31,16 @@ $(function () {
assert.expect(2)
var $el = $('
')
var $button = $el.bootstrapButton()
- assert.ok($button instanceof $, 'returns jquery collection')
+ assert.true($button instanceof $, 'returns jquery collection')
assert.strictEqual($button[0], $el[0], 'collection contains element')
})
QUnit.test('should toggle active', function (assert) {
assert.expect(2)
var $btn = $('
mdo ')
- assert.ok(!$btn.hasClass('active'), 'btn does not have active class')
+ assert.false($btn.hasClass('active'), 'btn does not have active class')
$btn.bootstrapButton('toggle')
- assert.ok($btn.hasClass('active'), 'btn has class active')
+ assert.true($btn.hasClass('active'), 'btn has class active')
})
QUnit.test('should toggle active when btn children are clicked', function (assert) {
@@ -48,9 +50,9 @@ $(function () {
$btn
.append($inner)
.appendTo('#qunit-fixture')
- assert.ok(!$btn.hasClass('active'), 'btn does not have active class')
+ assert.false($btn.hasClass('active'), 'btn does not have active class')
$inner.trigger('click')
- assert.ok($btn.hasClass('active'), 'btn has class active')
+ assert.true($btn.hasClass('active'), 'btn has class active')
})
QUnit.test('should toggle aria-pressed', function (assert) {
@@ -61,6 +63,22 @@ $(function () {
assert.strictEqual($btn.attr('aria-pressed'), 'true', 'btn aria-pressed state is true')
})
+ QUnit.test('should not toggle aria-pressed on buttons with disabled class', function (assert) {
+ assert.expect(2)
+ var $btn = $('
redux ')
+ assert.strictEqual($btn.attr('aria-pressed'), 'false', 'btn aria-pressed state is false')
+ $btn.bootstrapButton('toggle')
+ assert.strictEqual($btn.attr('aria-pressed'), 'false', 'btn aria-pressed state is still false')
+ })
+
+ QUnit.test('should not toggle aria-pressed on buttons that are disabled', function (assert) {
+ assert.expect(2)
+ var $btn = $('
redux ')
+ assert.strictEqual($btn.attr('aria-pressed'), 'false', 'btn aria-pressed state is false')
+ $btn.bootstrapButton('toggle')
+ assert.strictEqual($btn.attr('aria-pressed'), 'false', 'btn aria-pressed state is still false')
+ })
+
QUnit.test('should toggle aria-pressed on buttons with container', function (assert) {
assert.expect(1)
var groupHTML = '
' +
@@ -84,13 +102,73 @@ $(function () {
assert.strictEqual($btn.attr('aria-pressed'), 'true', 'btn aria-pressed state is true')
})
+ QUnit.test('should assign active class on page load to buttons with aria-pressed="true"', function (assert) {
+ assert.expect(1)
+ var done = assert.async()
+ var $btn = $('
mdo ')
+ $btn.appendTo('#qunit-fixture')
+ $(window).trigger($.Event('load'))
+ setTimeout(function () {
+ assert.true($btn.hasClass('active'), 'button with aria-pressed="true" has been given class active')
+ done()
+ }, 5)
+ })
+
+ QUnit.test('should assign active class on page load to button checkbox with checked attribute', function (assert) {
+ assert.expect(1)
+ var done = assert.async()
+ var groupHTML = '
' +
+ '' +
+ ' ' +
+ '
'
+ var $group = $(groupHTML).appendTo('#qunit-fixture')
+ var $btn = $group.children().eq(0)
+
+ $(window).trigger($.Event('load'))
+ setTimeout(function () {
+ assert.true($btn.hasClass('active'), 'checked checkbox button has been given class active')
+ done()
+ }, 5)
+ })
+
+ QUnit.test('should remove active class on page load from buttons without aria-pressed="true"', function (assert) {
+ assert.expect(1)
+ var done = assert.async()
+ var $btn = $('
mdo ')
+ $btn.appendTo('#qunit-fixture')
+ $(window).trigger($.Event('load'))
+ setTimeout(function () {
+ assert.false($btn.hasClass('active'), 'button without aria-pressed="true" has had active class removed')
+ done()
+ }, 5)
+ })
+
+ QUnit.test('should remove active class on page load from button checkbox without checked attribute', function (assert) {
+ assert.expect(1)
+ var done = assert.async()
+ var groupHTML = '
' +
+ '' +
+ ' ' +
+ '
'
+ var $group = $(groupHTML).appendTo('#qunit-fixture')
+ var $btn = $group.children().eq(0)
+
+ $(window).trigger($.Event('load'))
+ setTimeout(function () {
+ assert.false($btn.hasClass('active'), 'unchecked checkbox button has had active class removed')
+ done()
+ }, 5)
+ })
+
QUnit.test('should trigger input change event when toggled button has input field', function (assert) {
assert.expect(1)
var done = assert.async()
var groupHTML = '
' +
'' +
- ' ' +
'
'
var $group = $(groupHTML).appendTo('#qunit-fixture')
@@ -104,8 +182,34 @@ $(function () {
$group.find('label').trigger('click')
})
+ QUnit.test('should trigger label change event only once', function (assert) {
+ assert.expect(1)
+ var done = assert.async()
+ var countChangeEvent = 0
+
+ var groupHTML = '
' +
+ '' +
+ '✓ checkbox ' +
+ ' ' +
+ '
'
+ var $group = $(groupHTML).appendTo('#qunit-fixture')
+
+ var $btn = $group.children().eq(0)
+
+ $group.find('label').on('change', function () {
+ countChangeEvent++
+ })
+
+ setTimeout(function () {
+ assert.strictEqual(countChangeEvent, 1, 'onchange event fired only once')
+ done()
+ }, 5)
+
+ $btn[0].click()
+ })
+
QUnit.test('should check for closest matching toggle', function (assert) {
- assert.expect(12)
+ assert.expect(18)
var groupHTML = '
' +
'
' +
'' +
'' +
- ' ' +
'
'
var $group = $(groupHTML).appendTo('#qunit-fixture')
var $btn = $group.children().eq(0)
- var $hidden = $btn.find('input#option1-default')
- var $cb = $btn.find('input#option1')
+ $group.find('input').on('click', function (e) {
+ e.preventDefault()
+ assert.ok(true, 'click event fired')
+ done()
+ })
- assert.ok($btn.hasClass('active'), 'btn has active class')
- assert.ok($cb.prop('checked'), 'btn is checked')
- assert.ok(!$hidden.prop('checked'), 'hidden is not checked')
- $btn.trigger('click')
- assert.ok(!$btn.hasClass('active'), 'btn does not have active class')
- assert.ok(!$cb.prop('checked'), 'btn is not checked')
- assert.ok(!$hidden.prop('checked'), 'hidden is not checked') // should not be changed
+ $btn[0].click()
+ })
+
+ QUnit.test('should fire click event on label', function (assert) {
+ assert.expect(1)
+ var done = assert.async()
+ var groupHTML = '' +
+ '' +
+ ' ' +
+ '
'
+ var $group = $(groupHTML).appendTo('#qunit-fixture')
+
+ var $btn = $group.children().eq(0)
+ $group.find('label').on('click', function (e) {
+ e.preventDefault()
+ assert.ok(true, 'click event fired')
+ done()
+ })
+
+ $btn[0].click()
})
QUnit.test('should not add aria-pressed on labels for radio/checkbox inputs in a data-toggle="buttons" group', function (assert) {
assert.expect(2)
var groupHTML = '' +
- '
'
var $group = $(groupHTML).appendTo('#qunit-fixture')
@@ -174,17 +302,36 @@ $(function () {
var $btn2 = $group.children().eq(1)
$btn1.find('input').trigger('click')
- assert.ok($btn1.is(':not([aria-pressed])'), 'label for nested checkbox input has not been given an aria-pressed attribute')
+ assert.true($btn1.is(':not([aria-pressed])'), 'label for nested checkbox input has not been given an aria-pressed attribute')
$btn2.find('input').trigger('click')
- assert.ok($btn2.is(':not([aria-pressed])'), 'label for nested radio input has not been given an aria-pressed attribute')
+ assert.true($btn2.is(':not([aria-pressed])'), 'label for nested radio input has not been given an aria-pressed attribute')
})
QUnit.test('should handle disabled attribute on non-button elements', function (assert) {
- assert.expect(2)
+ assert.expect(4)
var groupHTML = '' +
- '' +
- '' +
+ ' ' +
+ '
'
+ var $group = $(groupHTML).appendTo('#qunit-fixture')
+
+ var $btn = $group.children().eq(0)
+ var $input = $btn.children().eq(0)
+
+ assert.true($btn.is(':not(.active)'), 'button is initially not active')
+ assert.false($input.prop('checked'), 'checkbox is initially not checked')
+ $btn[0].click() // fire a real click on the DOM node itself, not a click() on the jQuery object that just aliases to trigger('click')
+ assert.true($btn.is(':not(.active)'), 'button did not become active')
+ assert.false($input.prop('checked'), 'checkbox did not get checked')
+ })
+
+ QUnit.test('should not set active class if inner hidden checkbox is disabled but author forgot to set disabled class on outer button', function (assert) {
+ assert.expect(4)
+ var groupHTML = '' +
+ '' +
+ ' ' +
'
'
var $group = $(groupHTML).appendTo('#qunit-fixture')
@@ -192,9 +339,123 @@ $(function () {
var $btn = $group.children().eq(0)
var $input = $btn.children().eq(0)
- $btn.trigger('click')
- assert.ok($btn.is(':not(.active)'), 'button did not become active')
- assert.ok(!$input.is(':checked'), 'checkbox did not get checked')
+ assert.true($btn.is(':not(.active)'), 'button is initially not active')
+ assert.false($input.prop('checked'), 'checkbox is initially not checked')
+ $btn[0].click() // fire a real click on the DOM node itself, not a click() on the jQuery object that just aliases to trigger('click')
+ assert.true($btn.is(':not(.active)'), 'button did not become active')
+ assert.false($input.prop('checked'), 'checkbox did not get checked')
+ })
+
+ QUnit.test('should correctly set checked state on input and active class on label when using ' +
+ '' +
+ ' ' +
+ '
'
+ var $group = $(groupHTML).appendTo('#qunit-fixture')
+
+ var $label = $group.children().eq(0)
+ var $input = $label.children().eq(0)
+
+ assert.true($label.is(':not(.active)'), 'label is initially not active')
+ assert.false($input.prop('checked'), 'checkbox is initially not checked')
+ $label[0].click() // fire a real click on the DOM node itself, not a click() on the jQuery object that just aliases to trigger('click')
+ assert.true($label.is('.active'), 'label is active after click')
+ assert.true($input.prop('checked'), 'checkbox is checked after click')
+ })
+
+ QUnit.test('should correctly set checked state on input and active class on the faked button when using
structure', function (assert) {
+ assert.expect(4)
+ var groupHTML = '' +
+ '
' +
+ '
' +
+ '
is initially not active')
+ assert.false($input.prop('checked'), 'checkbox is initially not checked')
+ $btn[0].click() // fire a real click on the DOM node itself, not a click() on the jQuery object that just aliases to trigger('click')
+ assert.true($btn.is('.active'), '
is active after click')
+ assert.true($input.prop('checked'), 'checkbox is checked after click')
+ })
+
+ QUnit.test('should correctly set checked state on input and active class on the label when using button toggle', function (assert) {
+ assert.expect(6)
+ var groupHTML = '
' +
+ '' +
+ ' ' +
+ '
'
+ var $group = $(groupHTML).appendTo('#qunit-fixture')
+
+ var $btn = $group.children().eq(0)
+ var $input = $btn.children().eq(0)
+
+ assert.true($btn.is(':not(.active)'), '
is initially not active')
+ assert.false($input.prop('checked'), 'checkbox property is initially not checked')
+ assert.false($input[0].checked, 'checkbox is not checked by jquery after click')
+ $btn.bootstrapButton('toggle')
+ assert.true($btn.is('.active'), ' is active after click')
+ assert.true($input.prop('checked'), 'checkbox property is checked after click')
+ assert.true($input[0].checked, 'checkbox is checked by jquery after click')
+ })
+
+ QUnit.test('should not do anything if the click was just sent to the outer container with data-toggle', function (assert) {
+ assert.expect(4)
+ var groupHTML = '' +
+ '' +
+ ' ' +
+ '
'
+ var $group = $(groupHTML).appendTo('#qunit-fixture')
+
+ var $label = $group.children().eq(0)
+ var $input = $label.children().eq(0)
+
+ assert.true($label.is(':not(.active)'), 'label is initially not active')
+ assert.false($input.prop('checked'), 'checkbox is initially not checked')
+ $group[0].click() // fire a real click on the DOM node itself, not a click() on the jQuery object that just aliases to trigger('click')
+ assert.true($label.is(':not(.active)'), 'label is not active after click')
+ assert.false($input.prop('checked'), 'checkbox is not checked after click')
+ })
+
+ QUnit.test('should not try and set checked property on an input of type="hidden"', function (assert) {
+ assert.expect(2)
+ var groupHTML = '' +
+ '' +
+ ' ' +
+ '
'
+ var $group = $(groupHTML).appendTo('#qunit-fixture')
+
+ var $label = $group.children().eq(0)
+ var $input = $label.children().eq(0)
+
+ assert.false($input.prop('checked'), 'hidden input initially has no checked property')
+ $label[0].click() // fire a real click on the DOM node itself, not a click() on the jQuery object that just aliases to trigger('click')
+ assert.false($input.prop('checked'), 'hidden input does not have a checked property')
+ })
+
+ QUnit.test('should not try and set checked property on an input that is not a radio button or checkbox', function (assert) {
+ assert.expect(2)
+ var groupHTML = '' +
+ '' +
+ ' ' +
+ '
'
+ var $group = $(groupHTML).appendTo('#qunit-fixture')
+
+ var $label = $group.children().eq(0)
+ var $input = $label.children().eq(0)
+
+ assert.false($input.prop('checked'), 'text input initially has no checked property')
+ $label[0].click() // fire a real click on the DOM node itself, not a click() on the jQuery object that just aliases to trigger('click')
+ assert.false($input.prop('checked'), 'text input does not have a checked property')
})
QUnit.test('dispose should remove data and the element', function (assert) {
@@ -203,20 +464,16 @@ $(function () {
var $el = $('
')
var $button = $el.bootstrapButton()
- assert.ok(typeof $button.data('bs.button') !== 'undefined')
+ assert.notStrictEqual(typeof $button.data('bs.button'), 'undefined')
$button.data('bs.button').dispose()
- assert.ok(typeof $button.data('bs.button') === 'undefined')
+ assert.strictEqual(typeof $button.data('bs.button'), 'undefined')
})
QUnit.test('should return button version', function (assert) {
assert.expect(1)
- if (typeof Button !== 'undefined') {
- assert.ok(typeof Button.VERSION === 'string')
- } else {
- assert.notOk()
- }
+ assert.strictEqual(typeof Button.VERSION, 'string')
})
})
diff --git a/js/tests/unit/carousel.js b/js/tests/unit/carousel.js
index d6fea2f34ee1..ac217f1588fd 100644
--- a/js/tests/unit/carousel.js
+++ b/js/tests/unit/carousel.js
@@ -56,7 +56,7 @@ $(function () {
var defaultConfig = Carousel.Default
- assert.strictEqual(defaultConfig.touch, true)
+ assert.true(defaultConfig.touch)
})
QUnit.test('should throw explicit error on undefined method', function (assert) {
@@ -65,8 +65,8 @@ $(function () {
$el.bootstrapCarousel()
try {
$el.bootstrapCarousel('noMethod')
- } catch (err) {
- assert.strictEqual(err.message, 'No method named "noMethod"')
+ } catch (error) {
+ assert.strictEqual(error.message, 'No method named "noMethod"')
}
})
@@ -74,7 +74,7 @@ $(function () {
assert.expect(2)
var $el = $('
')
var $carousel = $el.bootstrapCarousel()
- assert.ok($carousel instanceof $, 'returns jquery collection')
+ assert.true($carousel instanceof $, 'returns jquery collection')
assert.strictEqual($carousel[0], $el[0], 'collection contains element')
})
@@ -89,11 +89,11 @@ $(function () {
try {
$('
').bootstrapCarousel(config)
- } catch (err) {
- message = err.message
+ } catch (error) {
+ message = error.message
}
- assert.ok(message === expectedMessage, 'correct error message')
+ assert.strictEqual(message, expectedMessage, 'correct error message')
config = {
keyboard: document.createElement('div')
@@ -102,11 +102,11 @@ $(function () {
try {
$('
').bootstrapCarousel(config)
- } catch (err) {
- message = err.message
+ } catch (error) {
+ message = error.message
}
- assert.ok(message === expectedMessage, 'correct error message')
+ assert.strictEqual(message, expectedMessage, 'correct error message')
})
QUnit.test('should not fire slid when slide is prevented', function (assert) {
@@ -134,13 +134,13 @@ $(function () {
'' +
'' +
'' +
'
' +
'
' +
@@ -516,13 +516,26 @@ $(function () {
'
'
var $carousel = $(templateHTML)
+ $carousel.appendTo('body')
+ $carousel.bootstrapCarousel()
+ assert.strictEqual($carousel.data('bs.carousel')._config.interval, 1814)
+ $carousel.remove()
+
+ $carousel.appendTo('body')
+ $carousel.bootstrapCarousel(0)
+ $carousel.data('bs.carousel').cycle()
+ assert.strictEqual($carousel.data('bs.carousel')._config.interval, 2814)
+ $carousel.remove()
+
$carousel.appendTo('body')
$carousel.bootstrapCarousel(1)
+ $carousel.data('bs.carousel').cycle()
assert.strictEqual($carousel.data('bs.carousel')._config.interval, 3814)
$carousel.remove()
$carousel.appendTo('body')
$carousel.bootstrapCarousel(2)
+ $carousel.data('bs.carousel').cycle()
assert.strictEqual($carousel.data('bs.carousel')._config.interval, 1814, 'reverts to default interval if no data-interval is set')
$carousel.remove()
})
@@ -534,7 +547,7 @@ $(function () {
'
' +
'
' +
'
' +
- '' +
+ '' +
'
' +
'
' +
'
' +
@@ -560,7 +573,7 @@ $(function () {
'
' +
'
' +
'
' +
- '' +
+ '' +
'
' +
'
' +
'
' +
@@ -652,18 +665,18 @@ $(function () {
var eventArrowDown = $.Event('keydown', {
which: 40
})
- var eventArrowUp = $.Event('keydown', {
+ var eventArrowUp = $.Event('keydown', {
which: 38
})
$template.one('keydown', function (event) {
- assert.strictEqual(event.isDefaultPrevented(), false)
+ assert.false(event.isDefaultPrevented())
})
$template.trigger(eventArrowDown)
$template.one('keydown', function (event) {
- assert.strictEqual(event.isDefaultPrevented(), false)
+ assert.false(event.isDefaultPrevented())
done()
})
@@ -763,13 +776,13 @@ $(function () {
'' +
'
' +
'
' +
@@ -810,13 +823,13 @@ $(function () {
'' +
'
' +
'
' +
@@ -844,13 +857,13 @@ $(function () {
'' +
'
' +
'
' +
@@ -892,13 +905,13 @@ $(function () {
'' +
'
' +
'
' +
@@ -937,18 +950,18 @@ $(function () {
which: 65
}) // 65 for "a"
$inputText.on('keydown', function (event) {
- assert.strictEqual(event.isDefaultPrevented(), false)
+ assert.false(event.isDefaultPrevented())
})
$inputText.trigger(eventKeyDown)
$textArea.on('keydown', function (event) {
- assert.strictEqual(event.isDefaultPrevented(), false)
+ assert.false(event.isDefaultPrevented())
done()
})
$textArea.trigger(eventKeyDown)
})
- QUnit.test('Should not go to the next item when the carousel is not visible', function (assert) {
+ QUnit.test('should not go to the next item when the carousel is not visible', function (assert) {
assert.expect(2)
var done = assert.async()
var html = '
' +
@@ -972,20 +985,20 @@ $(function () {
var $firstItem = $('#firstItem')
setTimeout(function () {
- assert.ok($firstItem.hasClass('active'))
+ assert.true($firstItem.hasClass('active'))
$html
.bootstrapCarousel('dispose')
.attr('style', 'visibility: hidden;')
.bootstrapCarousel()
setTimeout(function () {
- assert.ok($firstItem.hasClass('active'))
+ assert.true($firstItem.hasClass('active'))
done()
}, 80)
}, 80)
})
- QUnit.test('Should not go to the next item when the parent of the carousel is not visible', function (assert) {
+ QUnit.test('should not go to the next item when the parent of the carousel is not visible', function (assert) {
assert.expect(2)
var done = assert.async()
var html = '
' +
@@ -1012,13 +1025,13 @@ $(function () {
var $firstItem = $('#firstItem')
setTimeout(function () {
- assert.ok($firstItem.hasClass('active'))
+ assert.true($firstItem.hasClass('active'))
$carousel.bootstrapCarousel('dispose')
$parent.attr('style', 'visibility: hidden;')
$carousel.bootstrapCarousel()
setTimeout(function () {
- assert.ok($firstItem.hasClass('active'))
+ assert.true($firstItem.hasClass('active'))
done()
}, 80)
}, 80)
@@ -1056,8 +1069,8 @@ $(function () {
$carousel.one('slid.bs.carousel', function () {
assert.ok(true, 'slid event fired')
- assert.ok($item.hasClass('active'))
- assert.ok(spy.called)
+ assert.true($item.hasClass('active'))
+ assert.true(spy.called)
$styles.remove()
delete document.documentElement.ontouchstart
done()
@@ -1098,8 +1111,8 @@ $(function () {
$carousel.one('slid.bs.carousel', function () {
assert.ok(true, 'slid event fired')
- assert.ok($item.hasClass('active'))
- assert.ok(spy.called)
+ assert.true($item.hasClass('active'))
+ assert.true(spy.called)
delete document.documentElement.ontouchstart
restorePointerEvents()
done()
@@ -1118,7 +1131,7 @@ $(function () {
}
document.documentElement.ontouchstart = $.noop
- assert.expect(3)
+ assert.expect(4)
Simulator.setType('pointer')
var $styles = $(stylesCarousel).appendTo('head')
@@ -1145,8 +1158,9 @@ $(function () {
$carousel.one('slid.bs.carousel', function () {
assert.ok(true, 'slid event fired')
- assert.ok(!$item.hasClass('active'))
- assert.ok(spy.called)
+ assert.false($item.hasClass('active'))
+ assert.true(spy.called)
+ assert.strictEqual(carousel.touchDeltaX, 0)
$styles.remove()
delete document.documentElement.ontouchstart
done()
@@ -1160,7 +1174,7 @@ $(function () {
})
QUnit.test('should allow swipeleft and call next with touch events', function (assert) {
- assert.expect(3)
+ assert.expect(4)
clearPointerEvents()
Simulator.setType('touch')
document.documentElement.ontouchstart = $.noop
@@ -1188,8 +1202,9 @@ $(function () {
$carousel.one('slid.bs.carousel', function () {
assert.ok(true, 'slid event fired')
- assert.ok(!$item.hasClass('active'))
- assert.ok(spy.called)
+ assert.false($item.hasClass('active'))
+ assert.true(spy.called)
+ assert.strictEqual(carousel.touchDeltaX, 0)
restorePointerEvents()
delete document.documentElement.ontouchstart
done()
@@ -1243,7 +1258,7 @@ $(function () {
carousel.next()
- assert.strictEqual(spy.called, false)
+ assert.false(spy.called)
})
QUnit.test('should call next when the page is visible', function (assert) {
@@ -1267,7 +1282,67 @@ $(function () {
carousel.nextWhenVisible()
- assert.strictEqual(spy.called, true)
+ assert.true(spy.called)
sandbox.restore()
})
+
+ QUnit.test('should not cycle when there is no attribute data-ride', function (assert) {
+ assert.expect(1)
+
+ var spy = sinon.spy(Carousel.prototype, 'cycle')
+
+ var carouselHTML = '
'
+ var $carousel = $(carouselHTML)
+ $carousel.appendTo('#qunit-fixture')
+ $carousel.bootstrapCarousel()
+
+ assert.false(spy.called)
+ spy.restore()
+ })
+
+ QUnit.test('should cycle when there is data-ride attribute', function (assert) {
+ assert.expect(1)
+
+ var spy = sinon.spy(Carousel.prototype, 'cycle')
+
+ var carouselHTML = '
'
+ var $carousel = $(carouselHTML)
+ $carousel.appendTo('#qunit-fixture')
+ $carousel.bootstrapCarousel()
+
+ assert.true(spy.called)
+ spy.restore()
+ })
+
+ QUnit.test('should init carousels with data-ride on load event', function (assert) {
+ assert.expect(1)
+
+ var done = assert.async()
+ var spy = sinon.spy(Carousel, '_jQueryInterface')
+
+ var carouselHTML = '
'
+ var $carousel = $(carouselHTML)
+ $carousel.appendTo('#qunit-fixture')
+
+ $(window).trigger($.Event('load'))
+
+ setTimeout(function () {
+ assert.true(spy.called)
+ spy.restore()
+ done()
+ }, 5)
+ })
+
+ QUnit.test('should not add touch event listeners when touch option set to false', function (assert) {
+ assert.expect(1)
+
+ var spy = sinon.spy(Carousel.prototype, '_addTouchEventListeners')
+ var $carousel = $('
')
+
+ $carousel.appendTo('#qunit-fixture')
+ $carousel.bootstrapCarousel()
+
+ assert.false(spy.called)
+ spy.restore()
+ })
})
diff --git a/js/tests/unit/collapse.js b/js/tests/unit/collapse.js
index e7fb8893edae..71d5630fd19d 100644
--- a/js/tests/unit/collapse.js
+++ b/js/tests/unit/collapse.js
@@ -31,8 +31,8 @@ $(function () {
$el.bootstrapCollapse()
try {
$el.bootstrapCollapse('noMethod')
- } catch (err) {
- assert.strictEqual(err.message, 'No method named "noMethod"')
+ } catch (error) {
+ assert.strictEqual(error.message, 'No method named "noMethod"')
}
})
@@ -40,7 +40,7 @@ $(function () {
assert.expect(2)
var $el = $('
')
var $collapse = $el.bootstrapCollapse()
- assert.ok($collapse instanceof $, 'returns jquery collection')
+ assert.true($collapse instanceof $, 'returns jquery collection')
assert.strictEqual($collapse[0], $el[0], 'collection contains element')
})
@@ -50,8 +50,8 @@ $(function () {
var $el = $('
')
$el.one('shown.bs.collapse', function () {
- assert.ok($el.hasClass('show'), 'has class "show"')
- assert.ok(!/height/i.test($el.attr('style')), 'has height reset')
+ assert.true($el.hasClass('show'), 'has class "show"')
+ assert.false(/height/i.test($el.attr('style')), 'has height reset')
done()
}).bootstrapCollapse('show')
})
@@ -63,12 +63,12 @@ $(function () {
var $el = $('
').appendTo('#qunit-fixture')
var $el2 = $('
').appendTo('#qunit-fixture')
$el.one('shown.bs.collapse', function () {
- assert.ok($el.hasClass('show'), 'has class "show"')
- assert.ok(!/height/i.test($el.attr('style')), 'has height reset')
+ assert.true($el.hasClass('show'), 'has class "show"')
+ assert.false(/height/i.test($el.attr('style')), 'has height reset')
})
$el2.one('shown.bs.collapse', function () {
- assert.ok($el2.hasClass('show'), 'has class "show"')
- assert.ok(!/height/i.test($el2.attr('style')), 'has height reset')
+ assert.true($el2.hasClass('show'), 'has class "show"')
+ assert.false(/height/i.test($el2.attr('style')), 'has height reset')
done()
})
$target.trigger('click')
@@ -93,8 +93,8 @@ $(function () {
var $el1 = $('#collapse1')
var $el2 = $('#collapse2')
$el1.one('shown.bs.collapse', function () {
- assert.ok($el1.hasClass('show'))
- assert.ok($el2.hasClass('show'))
+ assert.true($el1.hasClass('show'))
+ assert.true($el2.hasClass('show'))
done()
}).bootstrapCollapse('show')
})
@@ -103,7 +103,7 @@ $(function () {
assert.expect(1)
var $el = $('
').bootstrapCollapse('hide')
- assert.ok(!$el.hasClass('show'), 'does not have class "show"')
+ assert.false($el.hasClass('show'), 'does not have class "show"')
})
QUnit.test('should not fire shown when show is prevented', function (assert) {
@@ -161,7 +161,7 @@ $(function () {
$('
')
.appendTo('#qunit-fixture')
.on('shown.bs.collapse', function () {
- assert.ok(!$target.hasClass('collapsed'), 'target does not have collapsed class')
+ assert.false($target.hasClass('collapsed'), 'target does not have collapsed class')
done()
})
@@ -177,7 +177,7 @@ $(function () {
$('
')
.appendTo('#qunit-fixture')
.on('hidden.bs.collapse', function () {
- assert.ok($target.hasClass('collapsed'), 'target has collapsed class')
+ assert.true($target.hasClass('collapsed'), 'target has collapsed class')
done()
})
@@ -194,8 +194,8 @@ $(function () {
$('
')
.appendTo('#qunit-fixture')
.on('shown.bs.collapse', function () {
- assert.ok(!$target.hasClass('collapsed'), 'target trigger does not have collapsed class')
- assert.ok(!$alt.hasClass('collapsed'), 'alt trigger does not have collapsed class')
+ assert.false($target.hasClass('collapsed'), 'target trigger does not have collapsed class')
+ assert.false($alt.hasClass('collapsed'), 'alt trigger does not have collapsed class')
done()
})
@@ -212,14 +212,15 @@ $(function () {
$('
')
.appendTo('#qunit-fixture')
.on('hidden.bs.collapse', function () {
- assert.ok($target.hasClass('collapsed'), 'target has collapsed class')
- assert.ok($alt.hasClass('collapsed'), 'alt trigger has collapsed class')
+ assert.true($target.hasClass('collapsed'), 'target has collapsed class')
+ assert.true($alt.hasClass('collapsed'), 'alt trigger has collapsed class')
done()
})
$target.trigger('click')
})
+ // eslint-disable-next-line qunit/resolve-async
QUnit.test('should not close a collapse when initialized with "show" option if already shown', function (assert) {
assert.expect(0)
var done = assert.async()
@@ -235,6 +236,7 @@ $(function () {
setTimeout(done, 0)
})
+ // eslint-disable-next-line qunit/resolve-async
QUnit.test('should open a collapse when initialized with "show" option if not already shown', function (assert) {
assert.expect(1)
var done = assert.async()
@@ -250,6 +252,7 @@ $(function () {
setTimeout(done, 0)
})
+ // eslint-disable-next-line qunit/resolve-async
QUnit.test('should not show a collapse when initialized with "hide" option if already hidden', function (assert) {
assert.expect(0)
var done = assert.async()
@@ -264,6 +267,7 @@ $(function () {
setTimeout(done, 0)
})
+ // eslint-disable-next-line qunit/resolve-async
QUnit.test('should hide a collapse when initialized with "hide" option if not already hidden', function (assert) {
assert.expect(1)
var done = assert.async()
@@ -302,9 +306,9 @@ $(function () {
$('
')
.appendTo($groups.eq(2))
.on('shown.bs.collapse', function () {
- assert.ok($target1.hasClass('collapsed'), 'inactive target 1 does have class "collapsed"')
- assert.ok($target2.hasClass('collapsed'), 'inactive target 2 does have class "collapsed"')
- assert.ok(!$target3.hasClass('collapsed'), 'active target 3 does not have class "collapsed"')
+ assert.true($target1.hasClass('collapsed'), 'inactive target 1 does have class "collapsed"')
+ assert.true($target2.hasClass('collapsed'), 'inactive target 2 does have class "collapsed"')
+ assert.false($target3.hasClass('collapsed'), 'active target 3 does not have class "collapsed"')
done()
})
@@ -336,9 +340,9 @@ $(function () {
$('
')
.appendTo($groups.eq(2))
.on('shown.bs.collapse', function () {
- assert.ok($target1.hasClass('collapsed'), 'inactive target 1 does have class "collapsed"')
- assert.ok($target2.hasClass('collapsed'), 'inactive target 2 does have class "collapsed"')
- assert.ok(!$target3.hasClass('collapsed'), 'active target 3 does not have class "collapsed"')
+ assert.true($target1.hasClass('collapsed'), 'inactive target 1 does have class "collapsed"')
+ assert.true($target2.hasClass('collapsed'), 'inactive target 2 does have class "collapsed"')
+ assert.false($target3.hasClass('collapsed'), 'active target 3 does not have class "collapsed"')
done()
})
@@ -457,7 +461,7 @@ $(function () {
'
' +
'
'
var showFired = false
- var $groups = $(accordionHTML).appendTo('#qunit-fixture').find('.card')
+ var $groups = $(accordionHTML).appendTo('#qunit-fixture').find('.card')
var $target1 = $('
').appendTo($groups.eq(0))
@@ -468,7 +472,7 @@ $(function () {
})
var $target2 = $('
').appendTo($groups.eq(1))
- var $body2 = $('
').appendTo($groups.eq(1))
+ var $body2 = $('
').appendTo($groups.eq(1))
$target2.trigger('click')
@@ -479,7 +483,7 @@ $(function () {
$target1.trigger('click')
setTimeout(function () {
- assert.ok(!showFired, 'show event did not fire')
+ assert.false(showFired, 'show event did not fire')
done()
}, 1)
})
@@ -493,7 +497,7 @@ $(function () {
$('
')
.appendTo('#qunit-fixture')
.on('hidden.bs.collapse', function () {
- assert.ok($target.hasClass('collapsed'))
+ assert.true($target.hasClass('collapsed'))
done()
})
.bootstrapCollapse('hide')
@@ -508,7 +512,7 @@ $(function () {
$('
')
.appendTo('#qunit-fixture')
.on('shown.bs.collapse', function () {
- assert.ok(!$target.hasClass('collapsed'))
+ assert.false($target.hasClass('collapsed'))
done()
})
.bootstrapCollapse('show')
@@ -534,11 +538,11 @@ $(function () {
var $collapseOne = $('#collapseOne')
var $collapseTwo = $('#collapseTwo')
$collapseOne.on('shown.bs.collapse', function () {
- assert.ok($collapseOne.hasClass('show'), '#collapseOne is shown')
- assert.ok(!$collapseTwo.hasClass('show'), '#collapseTwo is not shown')
+ assert.true($collapseOne.hasClass('show'), '#collapseOne is shown')
+ assert.false($collapseTwo.hasClass('show'), '#collapseTwo is not shown')
$collapseTwo.on('shown.bs.collapse', function () {
- assert.ok(!$collapseOne.hasClass('show'), '#collapseOne is not shown')
- assert.ok($collapseTwo.hasClass('show'), '#collapseTwo is shown')
+ assert.false($collapseOne.hasClass('show'), '#collapseOne is not shown')
+ assert.true($collapseTwo.hasClass('show'), '#collapseTwo is shown')
done()
})
$triggerTwo.trigger($.Event('click'))
@@ -572,11 +576,11 @@ $(function () {
var $collapseOne = $('#collapseOne')
var $collapseTwo = $('#collapseTwo')
$collapseOne.on('shown.bs.collapse', function () {
- assert.ok($collapseOne.hasClass('show'), '#collapseOne is shown')
- assert.ok(!$collapseTwo.hasClass('show'), '#collapseTwo is not shown')
+ assert.true($collapseOne.hasClass('show'), '#collapseOne is shown')
+ assert.false($collapseTwo.hasClass('show'), '#collapseTwo is not shown')
$collapseTwo.on('shown.bs.collapse', function () {
- assert.ok(!$collapseOne.hasClass('show'), '#collapseOne is not shown')
- assert.ok($collapseTwo.hasClass('show'), '#collapseTwo is shown')
+ assert.false($collapseOne.hasClass('show'), '#collapseOne is not shown')
+ assert.true($collapseTwo.hasClass('show'), '#collapseTwo is shown')
done()
})
$triggerTwo.trigger($.Event('click'))
@@ -604,23 +608,23 @@ $(function () {
var $collapseTwoOne = $('#collapseTwoOne')
var $collapseTwoTwo = $('#collapseTwoTwo')
var collapsedElements = {
- one : false,
- two : false
+ one: false,
+ two: false
}
function firstTest() {
- assert.ok($collapseOneOne.hasClass('show'), '#collapseOneOne is shown')
- assert.ok($collapseOneTwo.hasClass('show'), '#collapseOneTwo is shown')
- assert.ok(!$collapseTwoOne.hasClass('show'), '#collapseTwoOne is not shown')
- assert.ok(!$collapseTwoTwo.hasClass('show'), '#collapseTwoTwo is not shown')
+ assert.true($collapseOneOne.hasClass('show'), '#collapseOneOne is shown')
+ assert.true($collapseOneTwo.hasClass('show'), '#collapseOneTwo is shown')
+ assert.false($collapseTwoOne.hasClass('show'), '#collapseTwoOne is not shown')
+ assert.false($collapseTwoTwo.hasClass('show'), '#collapseTwoTwo is not shown')
$triggerTwo.trigger($.Event('click'))
}
function secondTest() {
- assert.ok(!$collapseOneOne.hasClass('show'), '#collapseOneOne is not shown')
- assert.ok(!$collapseOneTwo.hasClass('show'), '#collapseOneTwo is not shown')
- assert.ok($collapseTwoOne.hasClass('show'), '#collapseTwoOne is shown')
- assert.ok($collapseTwoTwo.hasClass('show'), '#collapseTwoTwo is shown')
+ assert.false($collapseOneOne.hasClass('show'), '#collapseOneOne is not shown')
+ assert.false($collapseOneTwo.hasClass('show'), '#collapseOneTwo is not shown')
+ assert.true($collapseTwoOne.hasClass('show'), '#collapseTwoOne is shown')
+ assert.true($collapseTwoTwo.hasClass('show'), '#collapseTwoTwo is shown')
done()
}
@@ -688,17 +692,17 @@ $(function () {
var $nestedCollapseOne = $('#nestedCollapseOne')
$collapseOne.one('shown.bs.collapse', function () {
- assert.ok($collapseOne.hasClass('show'), '#collapseOne is shown')
- assert.ok(!$collapseTwo.hasClass('show'), '#collapseTwo is not shown')
- assert.ok(!$('#nestedCollapseOne').hasClass('show'), '#nestedCollapseOne is not shown')
+ assert.true($collapseOne.hasClass('show'), '#collapseOne is shown')
+ assert.false($collapseTwo.hasClass('show'), '#collapseTwo is not shown')
+ assert.false($('#nestedCollapseOne').hasClass('show'), '#nestedCollapseOne is not shown')
$nestedCollapseOne.one('shown.bs.collapse', function () {
- assert.ok($collapseOne.hasClass('show'), '#collapseOne is shown')
- assert.ok(!$collapseTwo.hasClass('show'), '#collapseTwo is not shown')
- assert.ok($nestedCollapseOne.hasClass('show'), '#nestedCollapseOne is shown')
+ assert.true($collapseOne.hasClass('show'), '#collapseOne is shown')
+ assert.false($collapseTwo.hasClass('show'), '#collapseTwo is not shown')
+ assert.true($nestedCollapseOne.hasClass('show'), '#nestedCollapseOne is shown')
$collapseTwo.one('shown.bs.collapse', function () {
- assert.ok(!$collapseOne.hasClass('show'), '#collapseOne is not shown')
- assert.ok($collapseTwo.hasClass('show'), '#collapseTwo is shown')
- assert.ok($nestedCollapseOne.hasClass('show'), '#nestedCollapseOne is shown')
+ assert.false($collapseOne.hasClass('show'), '#collapseOne is not shown')
+ assert.true($collapseTwo.hasClass('show'), '#collapseTwo is shown')
+ assert.true($nestedCollapseOne.hasClass('show'), '#nestedCollapseOne is shown')
done()
})
$triggerTwo.trigger($.Event('click'))
@@ -716,9 +720,9 @@ $(function () {
$('
')
.appendTo('#qunit-fixture')
.on('shown.bs.collapse', function () {
- assert.ok($(this).hasClass('show'))
- assert.ok($target.attr('aria-expanded') === 'true')
- assert.ok($target.prop('checked'))
+ assert.true($(this).hasClass('show'))
+ assert.strictEqual($target.attr('aria-expanded'), 'true')
+ assert.true($target.prop('checked'))
done()
})
@@ -737,17 +741,17 @@ $(function () {
var $target2 = $('
').appendTo('#qunit-fixture')
$target2.one('shown.bs.collapse', function () {
- assert.ok(!$trigger1.hasClass('collapsed'), 'trigger1 does not have collapsed class')
- assert.ok(!$trigger2.hasClass('collapsed'), 'trigger2 does not have collapsed class')
- assert.ok(!$trigger3.hasClass('collapsed'), 'trigger3 does not have collapsed class')
+ assert.false($trigger1.hasClass('collapsed'), 'trigger1 does not have collapsed class')
+ assert.false($trigger2.hasClass('collapsed'), 'trigger2 does not have collapsed class')
+ assert.false($trigger3.hasClass('collapsed'), 'trigger3 does not have collapsed class')
$target2.one('hidden.bs.collapse', function () {
- assert.ok(!$trigger1.hasClass('collapsed'), 'trigger1 does not have collapsed class')
- assert.ok($trigger2.hasClass('collapsed'), 'trigger2 has collapsed class')
- assert.ok(!$trigger3.hasClass('collapsed'), 'trigger3 does not have collapsed class')
+ assert.false($trigger1.hasClass('collapsed'), 'trigger1 does not have collapsed class')
+ assert.true($trigger2.hasClass('collapsed'), 'trigger2 has collapsed class')
+ assert.false($trigger3.hasClass('collapsed'), 'trigger3 does not have collapsed class')
$target1.one('hidden.bs.collapse', function () {
- assert.ok($trigger1.hasClass('collapsed'), 'trigger1 has collapsed class')
- assert.ok($trigger2.hasClass('collapsed'), 'trigger2 has collapsed class')
- assert.ok($trigger3.hasClass('collapsed'), 'trigger3 has collapsed class')
+ assert.true($trigger1.hasClass('collapsed'), 'trigger1 has collapsed class')
+ assert.true($trigger2.hasClass('collapsed'), 'trigger2 has collapsed class')
+ assert.true($trigger3.hasClass('collapsed'), 'trigger3 has collapsed class')
done()
})
$trigger1.trigger('click')
@@ -757,7 +761,7 @@ $(function () {
$trigger3.trigger('click')
})
- QUnit.test('should set aria-expanded="true" to triggers targeting shown collaspe and aria-expanded="false" only when all the targeted collapses are shown', function (assert) {
+ QUnit.test('should set aria-expanded="true" to triggers targeting shown collapse and aria-expanded="false" only when all the targeted collapses are shown', function (assert) {
assert.expect(9)
var done = assert.async()
@@ -802,11 +806,11 @@ $(function () {
$(htmlCollapse)
.appendTo('#qunit-fixture')
.on('shown.bs.collapse', function () {
- assert.ok($target.prop('checked'), '$trigger is checked')
+ assert.true($target.prop('checked'), '$trigger is checked')
var $testCheckbox = $('#testCheckbox')
$testCheckbox.trigger($.Event('click'))
setTimeout(function () {
- assert.ok($testCheckbox.prop('checked'), '$testCheckbox is checked too')
+ assert.true($testCheckbox.prop('checked'), '$testCheckbox is checked too')
done()
}, 5)
})
@@ -830,7 +834,7 @@ $(function () {
parent: $('.my-collapse')
})
assert.ok(true, 'collapse correctly created')
- } catch (err) {
+ } catch (_) {
assert.ok(false, 'collapse not created')
}
})
@@ -851,7 +855,7 @@ $(function () {
parent: $('.my-collapse')[0]
})
assert.ok(true, 'collapse correctly created')
- } catch (err) {
+ } catch (_) {
assert.ok(false, 'collapse not created')
}
})
@@ -882,8 +886,8 @@ $(function () {
})
$collapse2.on('shown.bs.collapse', function () {
- assert.ok($collapse2.hasClass('show'))
- assert.ok(!$('#collapse1').hasClass('show'))
+ assert.true($collapse2.hasClass('show'))
+ assert.false($('#collapse1').hasClass('show'))
done()
})
diff --git a/js/tests/unit/dropdown.js b/js/tests/unit/dropdown.js
index fd9b7f962958..db6c893fb272 100644
--- a/js/tests/unit/dropdown.js
+++ b/js/tests/unit/dropdown.js
@@ -31,8 +31,8 @@ $(function () {
$el.bootstrapDropdown()
try {
$el.bootstrapDropdown('noMethod')
- } catch (err) {
- assert.strictEqual(err.message, 'No method named "noMethod"')
+ } catch (error) {
+ assert.strictEqual(error.message, 'No method named "noMethod"')
}
})
@@ -40,7 +40,7 @@ $(function () {
assert.expect(2)
var $el = $('
')
var $dropdown = $el.bootstrapDropdown()
- assert.ok($dropdown instanceof $, 'returns jquery collection')
+ assert.true($dropdown instanceof $, 'returns jquery collection')
assert.strictEqual($dropdown[0], $el[0], 'collection contains element')
})
@@ -61,12 +61,37 @@ $(function () {
$(dropdownHTML).appendTo('#qunit-fixture')
var $dropdown = $('#qunit-fixture').find('[data-toggle="dropdown"]').bootstrapDropdown()
$dropdown.on('click', function () {
- assert.ok(!$dropdown.parent('.dropdown').hasClass('show'))
+ assert.false($dropdown.parent('.dropdown').hasClass('show'))
done()
})
$dropdown.trigger($.Event('click'))
})
+ QUnit.test('should not open dropdown if escape key was pressed on the toggle', function (assert) {
+ assert.expect(1)
+ var done = assert.async()
+ var dropdownHTML = '
' +
+ '
' +
+ 'Dropdown ' +
+ '' +
+ '
' +
+ '
'
+ $(dropdownHTML).appendTo('#qunit-fixture')
+ var $dropdown = $('#qunit-fixture').find('[data-toggle="dropdown"]').bootstrapDropdown()
+ var $button = $('button[data-toggle="dropdown"]')
+ // Key escape
+ $button.trigger('focus').trigger($.Event('keydown', {
+ which: 27
+ }))
+ assert.false($dropdown.parent('.dropdown').hasClass('show'), 'dropdown menu is not shown after escape pressed')
+ done()
+ })
+
QUnit.test('should not add class position-static to dropdown if boundary not set', function (assert) {
assert.expect(1)
var done = assert.async()
@@ -83,7 +108,7 @@ $(function () {
$dropdown
.parent('.dropdown')
.on('shown.bs.dropdown', function () {
- assert.ok(!$dropdown.parent('.dropdown').hasClass('position-static'), '"position-static" class not added')
+ assert.false($dropdown.parent('.dropdown').hasClass('position-static'), '"position-static" class not added')
done()
})
$dropdown.trigger('click')
@@ -105,7 +130,7 @@ $(function () {
$dropdown
.parent('.dropdown')
.on('shown.bs.dropdown', function () {
- assert.ok($dropdown.parent('.dropdown').hasClass('position-static'), '"position-static" class added')
+ assert.true($dropdown.parent('.dropdown').hasClass('position-static'), '"position-static" class added')
done()
})
$dropdown.trigger('click')
@@ -186,7 +211,7 @@ $(function () {
$(dropdownHTML).appendTo('#qunit-fixture')
var $dropdown = $('#qunit-fixture').find('[data-toggle="dropdown"]').bootstrapDropdown()
$dropdown.on('click', function () {
- assert.ok(!$dropdown.parent('.dropdown').hasClass('show'))
+ assert.false($dropdown.parent('.dropdown').hasClass('show'))
done()
})
$dropdown.trigger($.Event('click'))
@@ -210,7 +235,7 @@ $(function () {
$dropdown
.parent('.dropdown')
.on('shown.bs.dropdown', function () {
- assert.ok($dropdown.parent('.dropdown').hasClass('show'), '"show" class added on click')
+ assert.true($dropdown.parent('.dropdown').hasClass('show'), '"show" class added on click')
done()
})
$dropdown.trigger('click')
@@ -238,10 +263,10 @@ $(function () {
$dropdown
.parent('.dropdown')
.on('shown.bs.dropdown', function () {
- assert.ok($dropdown.parent('.dropdown').hasClass('show'), '"show" class added on click')
+ assert.true($dropdown.parent('.dropdown').hasClass('show'), '"show" class added on click')
$(document.body).trigger('click')
}).on('hidden.bs.dropdown', function () {
- assert.ok(!$dropdown.parent('.dropdown').hasClass('show'), '"show" class removed')
+ assert.false($dropdown.parent('.dropdown').hasClass('show'), '"show" class removed')
done()
})
$dropdown.trigger('click')
@@ -268,12 +293,12 @@ $(function () {
$dropdown
.parent('.dropdown')
.on('shown.bs.dropdown', function () {
- assert.ok($dropdown.parent('.dropdown').hasClass('show'), '"show" class added on click')
+ assert.true($dropdown.parent('.dropdown').hasClass('show'), '"show" class added on click')
var e = $.Event('keyup')
e.which = 9 // Tab
$(document.body).trigger(e)
}).on('hidden.bs.dropdown', function () {
- assert.ok(!$dropdown.parent('.dropdown').hasClass('show'), '"show" class removed')
+ assert.false($dropdown.parent('.dropdown').hasClass('show'), '"show" class removed')
done()
})
$dropdown.trigger('click')
@@ -284,7 +309,7 @@ $(function () {
var done = assert.async()
var dropdownHTML = '
' +
'
+ 
+