Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Random cleanup... #238

Merged
merged 4 commits into from
Nov 8, 2017
Merged

Random cleanup... #238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c6e6b3f
Remove max_line_length from .editorconfig.
rwjblue Nov 8, 2017
dbc3489
Update prettier version.
rwjblue Nov 8, 2017
aeb7f1a
Migrate from qunitjs to qunit.
rwjblue Nov 8, 2017
52b0e20
Update yarn.lock to latest allowed dep versions.
rwjblue Nov 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ trim_trailing_whitespace = true
insert_final_newline = true
indent_style = space
indent_size = 2
max_line_length = 100

[*.hbs]
insert_final_newline = false
Expand Down
4 changes: 2 additions & 2 deletions ember-cli-build.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ module.exports = function(defaults) {
behave. You most likely want to be modifying `./index.js` or app's build file
*/

app.import('node_modules/qunitjs/qunit/qunit.js', {
app.import('node_modules/qunit/qunit/qunit.js', {
type: 'test',
});

app.import('node_modules/qunitjs/qunit/qunit.css', {
app.import('node_modules/qunit/qunit/qunit.css', {
type: 'test',
});

Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"eslint-plugin-prettier": "^2.3.1",
"loader.js": "^4.2.3",
"prettier": "^1.7.4",
"qunitjs": "^2.4.0"
"qunit": "^2.4.1"
},
"engines": {
"node": "^4.5 || 6.* || >= 7.*"
Expand Down
8 changes: 6 additions & 2 deletions tests/test-helper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,9 @@ QUnit.testDone(function({ module, name }) {
// this is used to ensure that no tests accidentally leak `Ember.testing` state
if (Ember.testing) {
throw new Error(
`Ember.testing should be reset after test has completed. ${module}: ${name} did not reset Ember.testing`
`Ember.testing should be reset after test has completed. ${module}: ${
name
} did not reset Ember.testing`
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ugh... how is that "prettier"?! :-/

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hehe. I felt the same way. Unfortunately I was getting trolled by ember-try using npm to install bower (which ultimately ended up forcing all packages to the latest version regardless of useYarn flag) so I couldn’t dig in to how to prevent this. 😢

);
}

Expand All @@ -53,7 +55,9 @@ QUnit.testDone(function({ module, name }) {
let expected = `<div id="ember-testing"></div>`;
if (actual !== expected) {
throw new Error(
`Expected #ember-testing-container to be reset after ${module}: ${name}, but was \`${actual}\``
`Expected #ember-testing-container to be reset after ${module}: ${name}, but was \`${
actual
}\``
);
}
});
Expand Down
Loading