Skip to content
This repository was archived by the owner on Aug 7, 2023. It is now read-only.

Commit 28beeb6

Browse files
committed
Merge pull request #44 from AtomLinter/revert-code-styles
Revert code styles
2 parents b5720b1 + 1757cae commit 28beeb6

File tree

2 files changed

+15
-22
lines changed

2 files changed

+15
-22
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"devDependencies": {
3333
"babel-eslint": "^5.0.0",
3434
"eslint": "^2.2.0",
35-
"eslint-config-airbnb": "^6.0.0"
35+
"eslint-config-airbnb": "^6.0.1"
3636
},
3737
"eslintConfig": {
3838
"rules": {

spec/linter-jsonlint-spec.js

Lines changed: 14 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,21 @@ describe('The jsonlint provider for Linter', () => {
1010

1111
beforeEach(() => {
1212
atom.workspace.destroyActivePaneItem();
13-
waitsForPromise(() => {
14-
atom.packages.activatePackage('linter-jsonlint');
15-
return atom
16-
.packages
17-
.activatePackage('language-json')
18-
.then(() => atom.workspace.open(goodPath));
19-
});
13+
waitsForPromise(() =>
14+
Promise.all([
15+
atom.packages.activatePackage('linter-jsonlint'),
16+
atom.packages.activatePackage('language-json')
17+
])
18+
);
2019
});
2120

2221
describe('checks bad.md and', () => {
2322
let editor = null;
2423
beforeEach(() => {
2524
waitsForPromise(() =>
26-
atom
27-
.workspace
28-
.open(badPath)
29-
.then(openEditor => {
30-
editor = openEditor;
31-
})
25+
atom.workspace.open(badPath).then(openEditor => {
26+
editor = openEditor;
27+
})
3228
);
3329
});
3430

@@ -60,14 +56,11 @@ Expecting 'EOF', '}', ',', ']', got 'undefined'`);
6056

6157
it('finds nothing wrong with a valid file', () => {
6258
waitsForPromise(() =>
63-
atom
64-
.workspace
65-
.open(goodPath)
66-
.then(editor =>
67-
lint(editor).then(messages => {
68-
expect(messages.length).toEqual(0);
69-
})
70-
)
59+
atom.workspace.open(goodPath).then(editor =>
60+
lint(editor).then(messages => {
61+
expect(messages.length).toEqual(0);
62+
})
63+
)
7164
);
7265
});
7366
});

0 commit comments

Comments
 (0)