diff options
Diffstat (limited to 'test')
15 files changed, 23 insertions, 360 deletions
diff --git a/test/_old_fixtures/input-group/multiple-add-on-left.html b/test/_old_fixtures/input-group/multiple-add-on-left.html deleted file mode 100644 index 1a5eb9c..0000000 --- a/test/_old_fixtures/input-group/multiple-add-on-left.html +++ /dev/null @@ -1,31 +0,0 @@ -<!doctype html> -<html lang="en"> - <head> - <meta charset="utf-8"> - <meta http-equiv="X-UA-Compatible" content="IE=edge"> - <meta name="viewport" content="width=device-width, initial-scale=1"> - <title>Test</title> - <link rel="stylesheet" href="../../../node_modules/qunit/qunit/qunit.css"> - - <!--[if lt IE 9]> - <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script> - <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script> - <![endif]--> - <script src="../../../node_modules/jquery/dist/jquery.min.js"></script> - <script src="../../../node_modules/qunit/qunit/qunit.js"></script> - <script src="../../../dist/browser/bootlint.js"></script> - <script src="../generic-qunit.js"></script> - </head> - <body> - <div class="input-group"> - <span class="input-group-addon">@</span> - <span class="input-group-addon">@</span> - <input type="text" class="form-control" placeholder="Username"> - </div> - - <div id="qunit"></div> - <ol id="bootlint"> - <li data-lint="Having multiple add-ons on a single side of an input group is not supported"></li> - </ol> - </body> -</html> diff --git a/test/_old_fixtures/input-group/multiple-add-on-right.html b/test/_old_fixtures/input-group/multiple-add-on-right.html deleted file mode 100644 index 7f9608b..0000000 --- a/test/_old_fixtures/input-group/multiple-add-on-right.html +++ /dev/null @@ -1,31 +0,0 @@ -<!doctype html> -<html lang="en"> - <head> - <meta charset="utf-8"> - <meta http-equiv="X-UA-Compatible" content="IE=edge"> - <meta name="viewport" content="width=device-width, initial-scale=1"> - <title>Test</title> - <link rel="stylesheet" href="../../../node_modules/qunit/qunit/qunit.css"> - - <!--[if lt IE 9]> - <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script> - <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script> - <![endif]--> - <script src="../../../node_modules/jquery/dist/jquery.min.js"></script> - <script src="../../../node_modules/qunit/qunit/qunit.js"></script> - <script src="../../../dist/browser/bootlint.js"></script> - <script src="../generic-qunit.js"></script> - </head> - <body> - <div class="input-group"> - <input type="text" class="form-control" placeholder="Username"> - <span class="input-group-addon">.com</span> - <span class="input-group-addon">.info</span> - </div> - - <div id="qunit"></div> - <ol id="bootlint"> - <li data-lint="Having multiple add-ons on a single side of an input group is not supported"></li> - </ol> - </body> -</html> diff --git a/test/_old_fixtures/input-group/multiple-btn-add-on-left.html b/test/_old_fixtures/input-group/multiple-btn-add-on-left.html deleted file mode 100644 index ce404e8..0000000 --- a/test/_old_fixtures/input-group/multiple-btn-add-on-left.html +++ /dev/null @@ -1,35 +0,0 @@ -<!doctype html> -<html lang="en"> - <head> - <meta charset="utf-8"> - <meta http-equiv="X-UA-Compatible" content="IE=edge"> - <meta name="viewport" content="width=device-width, initial-scale=1"> - <title>Test</title> - <link rel="stylesheet" href="../../../node_modules/qunit/qunit/qunit.css"> - - <!--[if lt IE 9]> - <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script> - <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script> - <![endif]--> - <script src="../../../node_modules/jquery/dist/jquery.min.js"></script> - <script src="../../../node_modules/qunit/qunit/qunit.js"></script> - <script src="../../../dist/browser/bootlint.js"></script> - <script src="../generic-qunit.js"></script> - </head> - <body> - <div class="input-group"> - <span class="input-group-btn"> - <button class="btn btn-default" type="button">Work it!</button> - </span> - <span class="input-group-btn"> - <button class="btn btn-default" type="button">Harder!</button> - </span> - <input type="text" class="form-control"> - </div> - - <div id="qunit"></div> - <ol id="bootlint"> - <li data-lint="Having multiple add-ons on a single side of an input group is not supported"></li> - </ol> - </body> -</html> diff --git a/test/_old_fixtures/input-group/multiple-btn-add-on-right.html b/test/_old_fixtures/input-group/multiple-btn-add-on-right.html deleted file mode 100644 index 00a7776..0000000 --- a/test/_old_fixtures/input-group/multiple-btn-add-on-right.html +++ /dev/null @@ -1,35 +0,0 @@ -<!doctype html> -<html lang="en"> - <head> - <meta charset="utf-8"> - <meta http-equiv="X-UA-Compatible" content="IE=edge"> - <meta name="viewport" content="width=device-width, initial-scale=1"> - <title>Test</title> - <link rel="stylesheet" href="../../../node_modules/qunit/qunit/qunit.css"> - - <!--[if lt IE 9]> - <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script> - <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script> - <![endif]--> - <script src="../../../node_modules/jquery/dist/jquery.min.js"></script> - <script src="../../../node_modules/qunit/qunit/qunit.js"></script> - <script src="../../../dist/browser/bootlint.js"></script> - <script src="../generic-qunit.js"></script> - </head> - <body> - <div class="input-group"> - <input type="text" class="form-control"> - <span class="input-group-btn"> - <button class="btn btn-default" type="button">Work it!</button> - </span> - <span class="input-group-btn"> - <button class="btn btn-default" type="button">Harder!</button> - </span> - </div> - - <div id="qunit"></div> - <ol id="bootlint"> - <li data-lint="Having multiple add-ons on a single side of an input group is not supported"></li> - </ol> - </body> -</html> diff --git a/test/_old_fixtures/input-group/multiple-form-controls.html b/test/_old_fixtures/input-group/multiple-form-controls.html deleted file mode 100644 index e4c96e3..0000000 --- a/test/_old_fixtures/input-group/multiple-form-controls.html +++ /dev/null @@ -1,31 +0,0 @@ -<!doctype html> -<html lang="en"> - <head> - <meta charset="utf-8"> - <meta http-equiv="X-UA-Compatible" content="IE=edge"> - <meta name="viewport" content="width=device-width, initial-scale=1"> - <title>Test</title> - <link rel="stylesheet" href="../../../node_modules/qunit/qunit/qunit.css"> - - <!--[if lt IE 9]> - <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script> - <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script> - <![endif]--> - <script src="../../../node_modules/jquery/dist/jquery.min.js"></script> - <script src="../../../node_modules/qunit/qunit/qunit.js"></script> - <script src="../../../dist/browser/bootlint.js"></script> - <script src="../generic-qunit.js"></script> - </head> - <body> - <div class="input-group"> - <span class="input-group-addon">@</span> - <input type="text" class="form-control" placeholder="Username"> - <input type="text" class="form-control" placeholder="Username"> - </div> - - <div id="qunit"></div> - <ol id="bootlint"> - <li data-lint="Input groups cannot contain multiple `.form-control`s"></li> - </ol> - </body> -</html> diff --git a/test/_old_fixtures/input-group/multiple-mixed-add-on-left.html b/test/_old_fixtures/input-group/multiple-mixed-add-on-left.html deleted file mode 100644 index e276812..0000000 --- a/test/_old_fixtures/input-group/multiple-mixed-add-on-left.html +++ /dev/null @@ -1,33 +0,0 @@ -<!doctype html> -<html lang="en"> - <head> - <meta charset="utf-8"> - <meta http-equiv="X-UA-Compatible" content="IE=edge"> - <meta name="viewport" content="width=device-width, initial-scale=1"> - <title>Test</title> - <link rel="stylesheet" href="../../../node_modules/qunit/qunit/qunit.css"> - - <!--[if lt IE 9]> - <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script> - <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script> - <![endif]--> - <script src="../../../node_modules/jquery/dist/jquery.min.js"></script> - <script src="../../../node_modules/qunit/qunit/qunit.js"></script> - <script src="../../../dist/browser/bootlint.js"></script> - <script src="../generic-qunit.js"></script> - </head> - <body> - <div class="input-group"> - <span class="input-group-addon">@</span> - <span class="input-group-btn"> - <button class="btn btn-default" type="button">Work it!</button> - </span> - <input type="text" class="form-control" placeholder="Username"> - </div> - - <div id="qunit"></div> - <ol id="bootlint"> - <li data-lint="Having multiple add-ons on a single side of an input group is not supported"></li> - </ol> - </body> -</html> diff --git a/test/_old_fixtures/input-group/select.html b/test/_old_fixtures/input-group/select.html deleted file mode 100644 index 710383f..0000000 --- a/test/_old_fixtures/input-group/select.html +++ /dev/null @@ -1,30 +0,0 @@ -<!doctype html> -<html lang="en"> - <head> - <meta charset="utf-8"> - <meta http-equiv="X-UA-Compatible" content="IE=edge"> - <meta name="viewport" content="width=device-width, initial-scale=1"> - <title>Test</title> - <link rel="stylesheet" href="../../../node_modules/qunit/qunit/qunit.css"> - - <!--[if lt IE 9]> - <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script> - <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script> - <![endif]--> - <script src="../../../node_modules/jquery/dist/jquery.min.js"></script> - <script src="../../../node_modules/qunit/qunit/qunit.js"></script> - <script src="../../../dist/browser/bootlint.js"></script> - <script src="../generic-qunit.js"></script> - </head> - <body> - <div class="input-group"> - <span class="input-group-addon">@</span> - <select class="form-control"><option value="no-way">No-how</option></select> - </div> - - <div id="qunit"></div> - <ol id="bootlint"> - <li data-lint="`.input-group` contains a `<select>`; this should be avoided as `<select>`s cannot be fully styled in WebKit browsers"></li> - </ol> - </body> -</html> diff --git a/test/_old_fixtures/input-group/textarea.html b/test/_old_fixtures/input-group/textarea.html deleted file mode 100644 index f57e410..0000000 --- a/test/_old_fixtures/input-group/textarea.html +++ /dev/null @@ -1,30 +0,0 @@ -<!doctype html> -<html lang="en"> - <head> - <meta charset="utf-8"> - <meta http-equiv="X-UA-Compatible" content="IE=edge"> - <meta name="viewport" content="width=device-width, initial-scale=1"> - <title>Test</title> - <link rel="stylesheet" href="../../../node_modules/qunit/qunit/qunit.css"> - - <!--[if lt IE 9]> - <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script> - <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script> - <![endif]--> - <script src="../../../node_modules/jquery/dist/jquery.min.js"></script> - <script src="../../../node_modules/qunit/qunit/qunit.js"></script> - <script src="../../../dist/browser/bootlint.js"></script> - <script src="../generic-qunit.js"></script> - </head> - <body> - <div class="input-group"> - <span class="input-group-addon">@</span> - <textarea class="form-control">Abomination</textarea> - </div> - - <div id="qunit"></div> - <ol id="bootlint"> - <li data-lint="`.input-group` contains a `<textarea>`; only text-based `<input>`s are permitted in an `.input-group`"></li> - </ol> - </body> -</html> diff --git a/test/_old_fixtures/input-group/valid.html b/test/_old_fixtures/input-group/valid.html deleted file mode 100644 index a9489fd..0000000 --- a/test/_old_fixtures/input-group/valid.html +++ /dev/null @@ -1,28 +0,0 @@ -<!doctype html> -<html lang="en"> - <head> - <meta charset="utf-8"> - <meta http-equiv="X-UA-Compatible" content="IE=edge"> - <meta name="viewport" content="width=device-width, initial-scale=1"> - <title>Test</title> - <link rel="stylesheet" href="../../../node_modules/qunit/qunit/qunit.css"> - - <!--[if lt IE 9]> - <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script> - <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script> - <![endif]--> - <script src="../../../node_modules/jquery/dist/jquery.min.js"></script> - <script src="../../../node_modules/qunit/qunit/qunit.js"></script> - <script src="../../../dist/browser/bootlint.js"></script> - <script src="../generic-qunit.js"></script> - </head> - <body> - <div class="input-group"> - <span class="input-group-addon">@</span> - <input type="text" class="form-control" placeholder="Username"> - </div> - - <div id="qunit"></div> - <ol id="bootlint"></ol> - </body> -</html> diff --git a/test/bootlint_test.js b/test/bootlint_test.js index c3c7e2a..3eb33b5 100644 --- a/test/bootlint_test.js +++ b/test/bootlint_test.js @@ -167,21 +167,6 @@ exports.bootlint = { }, */ /* - 'input groups with impermissible kind of form control': function (test) { - test.expect(3); - test.deepEqual(lintHtml(utf8Fixture('input-group/textarea.html')), - ['`.input-group` contains a `<textarea>`; only text-based `<input>`s are permitted in an `.input-group`'], - 'should complain about input groups with a <textarea> form control'); - test.deepEqual(lintHtml(utf8Fixture('input-group/select.html')), - ['`.input-group` contains a `<select>`; this should be avoided as `<select>`s cannot be fully styled in WebKit browsers'], - 'should complain about input groups with a <select> form control'); - test.deepEqual(lintHtml(utf8Fixture('input-group/valid.html')), - [], - 'should not complain about input groups with text-based <input>s.'); - test.done(); - }, - */ - /* 'tooltips and popovers on disabled elements': function (test) { test.expect(1); test.deepEqual(lintHtml(utf8Fixture('tooltips/on-disabled-elems.html')), @@ -204,7 +189,6 @@ exports.bootlint = { test.done(); }, */ - /* 'btn/input sizing used without input-group-* size': function (test) { test.expect(1); test.deepEqual(lintHtml(utf8Fixture('input-group/missing-input-group-sizing.html')), @@ -212,46 +196,30 @@ exports.bootlint = { 'should complain when an input/btn sizes are used within input-group.'); test.done(); }, - */ - /* - 'input groups with multiple form controls': function (test) { - test.expect(1); - test.deepEqual(lintHtml(utf8Fixture('input-group/multiple-form-controls.html')), - ['Input groups cannot contain multiple `.form-control`s'], - 'should complain when an input group contains multiple form controls.'); - test.done(); - }, - */ - /* 'mixing input groups with form groups': function (test) { test.expect(1); test.deepEqual(lintHtml(utf8Fixture('input-group/mixed-with-form-group.html')), - ['`.input-group` and `.form-group` cannot be used directly on the same element. Instead, nest the `.input-group` within the `.form-group`'], - 'should complain when .input-group and .form-group are used on the same element.'); + ['`.input-group` and `.form-group`/`.row`/`.form-row` cannot be used directly on the same element. Instead, nest the `.input-group` within the `.form-group`/`.row`/`.form-row`'], + 'should complain when .input-group and .form-group/.row/.form-row are used on the same element.'); test.done(); }, - */ - /* 'mixing input groups with grid columns': function (test) { test.expect(1); test.deepEqual(lintHtml(utf8Fixture('input-group/mixed-with-grid-col.html')), - ['`.input-group` and `.col-*-*` cannot be used directly on the same element. Instead, nest the `.input-group` within the `.col-*-*`'], + ['`.input-group` and `.col*` cannot be used directly on the same element. Instead, nest the `.input-group` within the `.col*`'], 'should complain when an input group has a grid column class on it.'); test.done(); }, - */ - /* 'input groups missing controls and addons': function (test) { test.expect(2); test.deepEqual(lintHtml(utf8Fixture('input-group/missing-input-group-addon.html')), - ['`.input-group` must have a `.form-control` and either an `.input-group-addon` or an `.input-group-btn`.'], + ['`.input-group` must have at least one `.form-control`/`.custom-select`/`.custom-file` child and also at least one `.input-group-prepend`/`.input-group-append` child.'], 'should complain when missing missing a `.form-control`'); test.deepEqual(lintHtml(utf8Fixture('input-group/missing-form-control.html')), - ['`.input-group` must have a `.form-control` and either an `.input-group-addon` or an `.input-group-btn`.'], - 'should complain when missing missing a `.input-group-addon`'); + ['`.input-group` must have at least one `.form-control`/`.custom-select`/`.custom-file` child and also at least one `.input-group-prepend`/`.input-group-append` child.'], + 'should complain when missing missing a `.input-group-prepend`'); test.done(); }, - */ 'non-column children of rows': function (test) { test.expect(2); test.deepEqual(lintHtml(utf8Fixture('grid/non-col-row-children.html')), @@ -263,27 +231,6 @@ exports.bootlint = { test.done(); }, /* - 'multiple columns on the same side of an input group': function (test) { - test.expect(5); - test.deepEqual(lintHtml(utf8Fixture('input-group/multiple-add-on-left.html')), - ['Having multiple add-ons on a single side of an input group is not supported'], - 'should complain when multiple normal add-ons are on the left side of an input group.'); - test.deepEqual(lintHtml(utf8Fixture('input-group/multiple-add-on-right.html')), - ['Having multiple add-ons on a single side of an input group is not supported'], - 'should complain when multiple normal add-ons are on the right side of an input group.'); - test.deepEqual(lintHtml(utf8Fixture('input-group/multiple-btn-add-on-left.html')), - ['Having multiple add-ons on a single side of an input group is not supported'], - 'should complain when multiple button add-ons are on the left side of an input group.'); - test.deepEqual(lintHtml(utf8Fixture('input-group/multiple-btn-add-on-right.html')), - ['Having multiple add-ons on a single side of an input group is not supported'], - 'should complain when multiple button add-ons are on the right side of an input group.'); - test.deepEqual(lintHtml(utf8Fixture('input-group/multiple-mixed-add-on-left.html')), - ['Having multiple add-ons on a single side of an input group is not supported'], - 'should complain when both a normal add-on and a button add-on are on the left side of an input group.'); - test.done(); - }, - */ - /* 'dropdown-toggle comes before btn': function (test) { test.expect(2); test.deepEqual(lintHtml(utf8Fixture('buttons/btn-toggle.html')), diff --git a/test/_old_fixtures/input-group/missing-form-control.html b/test/fixtures/input-group/missing-form-control.html index 5a10af8..317e2e8 100644 --- a/test/_old_fixtures/input-group/missing-form-control.html +++ b/test/fixtures/input-group/missing-form-control.html @@ -24,7 +24,7 @@ <div id="qunit"></div> <ol id="bootlint"> - <li data-lint="`.input-group` must have a `.form-control` and either an `.input-group-addon` or an `.input-group-btn`."></li> + <li data-lint="`.input-group` must have at least one `.form-control`/`.custom-select`/`.custom-file` child and also at least one `.input-group-prepend`/`.input-group-append` child."></li> </ol> </body> </html> diff --git a/test/_old_fixtures/input-group/missing-input-group-addon.html b/test/fixtures/input-group/missing-input-group-addon.html index d90edd2..ed1c7e1 100644 --- a/test/_old_fixtures/input-group/missing-input-group-addon.html +++ b/test/fixtures/input-group/missing-input-group-addon.html @@ -19,12 +19,12 @@ <body> <div class="input-group"> - <span class="input-group-addon">@</span> + <span class="input-group-prepend">@</span> </div> <div id="qunit"></div> <ol id="bootlint"> - <li data-lint="`.input-group` must have a `.form-control` and either an `.input-group-addon` or an `.input-group-btn`."></li> + <li data-lint="`.input-group` must have at least one `.form-control`/`.custom-select`/`.custom-file` child and also at least one `.input-group-prepend`/`.input-group-append` child."></li> </ol> </body> </html> diff --git a/test/_old_fixtures/input-group/missing-input-group-sizing.html b/test/fixtures/input-group/missing-input-group-sizing.html index 478fb3e..756b5e8 100644 --- a/test/_old_fixtures/input-group/missing-input-group-sizing.html +++ b/test/fixtures/input-group/missing-input-group-sizing.html @@ -19,18 +19,18 @@ <body> <div class="input-group"> - <span class="input-group-btn"> - <button id="button1" class="btn btn-default btn-lg" type="button">Go!</button> - </span> - <input id="input1" type="text" class="form-control input-lg"> + <div class="input-group-prepend"> + <button id="button1" class="btn btn-default btn-sm" type="button">Go!</button> + </div> + <input id="input1" type="text" class="form-control form-control-sm"> </div> - <div class="input-group"> - <span class="input-group-btn"> - <button id="button2" class="btn btn-default btn-lg" type="button">Go!</button> - </span> - <input id="input2" type="text" class="form-control input-lg"> - </div> + <!-- <div class="input-group"></div> + <input id="input2" type="text" class="form-control form-control-lg"> + <div class="input-group-append"> + <button id="button2" class="btn btn-default btn-lg" type="button">Go!</button> + </div> + </div> --> <div id="qunit"></div> <ol id="bootlint"> diff --git a/test/_old_fixtures/input-group/mixed-with-form-group.html b/test/fixtures/input-group/mixed-with-form-group.html index 74d4d18..b9d41cf 100644 --- a/test/_old_fixtures/input-group/mixed-with-form-group.html +++ b/test/fixtures/input-group/mixed-with-form-group.html @@ -18,13 +18,13 @@ </head> <body> <div class="input-group form-group"> - <span class="input-group-addon">@</span> + <span class="input-group-prepend">@</span> <input type="text" class="form-control" placeholder="Username"> </div> <div id="qunit"></div> <ol id="bootlint"> - <li data-lint="`.input-group` and `.form-group` cannot be used directly on the same element. Instead, nest the `.input-group` within the `.form-group`"></li> + <li data-lint="`.input-group` and `.form-group`/`.row`/`.form-row` cannot be used directly on the same element. Instead, nest the `.input-group` within the `.form-group`/`.row`/`.form-row`"></li> </ol> </body> </html> diff --git a/test/_old_fixtures/input-group/mixed-with-grid-col.html b/test/fixtures/input-group/mixed-with-grid-col.html index 805bdd5..f09b479 100644 --- a/test/_old_fixtures/input-group/mixed-with-grid-col.html +++ b/test/fixtures/input-group/mixed-with-grid-col.html @@ -20,7 +20,7 @@ <div class="container"> <div class="row"> <div class="input-group col-sm-12"> - <span class="input-group-addon">@</span> + <span class="input-group-prepend">@</span> <input type="text" class="form-control" placeholder="Username"> </div> </div> @@ -28,7 +28,7 @@ <div id="qunit"></div> <ol id="bootlint"> - <li data-lint="`.input-group` and `.col-*-*` cannot be used directly on the same element. Instead, nest the `.input-group` within the `.col-*-*`"></li> + <li data-lint="`.input-group` and `.col*` cannot be used directly on the same element. Instead, nest the `.input-group` within the `.col*`"></li> </ol> </body> </html> |