Skip to content

Commit bccde94

Browse files
Merge pull request #1140 from nelstrom/remove-nolint-ui
Remove the "Disable linting" checkbox
2 parents 8d77cde + eb2aa47 commit bccde94

File tree

2 files changed

+0
-13
lines changed

2 files changed

+0
-13
lines changed

addon/src/qunit-configuration.js

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import * as QUnit from 'qunit';
22

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

87
QUnit.config.testTimeout = QUnit.urlParams.devmode ? null : 60000; //Default Test Timeout 60 Seconds

addon/src/test-loader.js

-12
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
11
import * as QUnit from 'qunit';
22
import AbstractTestLoader, {
3-
addModuleExcludeMatcher,
43
addModuleIncludeMatcher,
54
} from 'ember-cli-test-loader/test-support/index';
65

7-
addModuleExcludeMatcher(function (moduleName) {
8-
return QUnit.urlParams.nolint && moduleName.match(/\.(jshint|lint-test)$/);
9-
});
10-
116
addModuleIncludeMatcher(function (moduleName) {
127
return moduleName.match(/\.jshint$/);
138
});
@@ -46,13 +41,6 @@ export class TestLoader extends AbstractTestLoader {
4641
Load tests following the default patterns:
4742
4843
* The module name ends with `-test`
49-
* The module name ends with `.jshint`
50-
51-
Excludes tests that match the following
52-
patterns when `?nolint` URL param is set:
53-
54-
* The module name ends with `.jshint`
55-
* The module name ends with `-lint-test`
5644
5745
@method loadTests
5846
*/

0 commit comments

Comments
 (0)