Skip to content

Commit

Permalink
Merge pull request #1140 from nelstrom/remove-nolint-ui
Browse files Browse the repository at this point in the history
Remove the "Disable linting" checkbox
  • Loading branch information
NullVoxPopuli authored Nov 2, 2023
2 parents 8d77cde + eb2aa47 commit bccde94
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 13 deletions.
1 change: 0 additions & 1 deletion addon/src/qunit-configuration.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import * as QUnit from 'qunit';

QUnit.config.autostart = false;
QUnit.config.urlConfig.push({ id: 'nocontainer', label: 'Hide container' });
QUnit.config.urlConfig.push({ id: 'nolint', label: 'Disable Linting' });
QUnit.config.urlConfig.push({ id: 'devmode', label: 'Development mode' });

QUnit.config.testTimeout = QUnit.urlParams.devmode ? null : 60000; //Default Test Timeout 60 Seconds
12 changes: 0 additions & 12 deletions addon/src/test-loader.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
import * as QUnit from 'qunit';
import AbstractTestLoader, {
addModuleExcludeMatcher,
addModuleIncludeMatcher,
} from 'ember-cli-test-loader/test-support/index';

addModuleExcludeMatcher(function (moduleName) {
return QUnit.urlParams.nolint && moduleName.match(/\.(jshint|lint-test)$/);
});

addModuleIncludeMatcher(function (moduleName) {
return moduleName.match(/\.jshint$/);
});
Expand Down Expand Up @@ -46,13 +41,6 @@ export class TestLoader extends AbstractTestLoader {
Load tests following the default patterns:
* The module name ends with `-test`
* The module name ends with `.jshint`
Excludes tests that match the following
patterns when `?nolint` URL param is set:
* The module name ends with `.jshint`
* The module name ends with `-lint-test`
@method loadTests
*/
Expand Down

0 comments on commit bccde94

Please sign in to comment.