Skip to content
This repository was archived by the owner on Nov 4, 2024. It is now read-only.

Commit b43bb17

Browse files
committed
Fix npm testing
1 parent 5c2ea2c commit b43bb17

File tree

6 files changed

+34
-26
lines changed

6 files changed

+34
-26
lines changed

.eslintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ module.exports = {
157157
}],
158158

159159
"key-spacing": 2, // enforce consistent spacing between keys and values in object literal properties
160-
"linebreak-style": [2, "windows"], // enforce consistent linebreak style
160+
"linebreak-style": [2, "unix"], // enforce consistent linebreak style
161161
// "lines-around-comment": 2, // require empty lines around comments
162162
// "max-depth": 2, // enforce a maximum depth that blocks can be nested
163163
"max-len": [2, 200], // enforce a maximum line length

.vscode/settings.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"files.eol": "\n"
3+
}

dev/Styles/FolderClear.less

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
.popups {
2-
.b-folder-clear-content {
3-
.modal-header {
4-
background-color: #fff;
5-
}
6-
}
7-
}
1+
.popups {
2+
.b-folder-clear-content {
3+
.modal-header {
4+
background-color: #fff;
5+
}
6+
}
7+
}

dev/Styles/FolderCreate.less

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
.popups {
2-
.b-folder-create-content {
3-
.modal-header {
4-
background-color: #fff;
5-
}
6-
}
7-
}
1+
.popups {
2+
.b-folder-create-content {
3+
.modal-header {
4+
background-color: #fff;
5+
}
6+
}
7+
}

dev/Styles/FolderSystem.less

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
.popups {
2-
.b-folder-system-content {
3-
.modal-header {
4-
background-color: #fff;
5-
}
6-
}
7-
}
1+
.popups {
2+
.b-folder-system-content {
3+
.modal-header {
4+
background-color: #fff;
5+
}
6+
}
7+
}

tests/Common/NpmTest.php

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,16 @@ class NpmTest extends \PHPUnit_Framework_TestCase
77
public function testJsValidate()
88
{
99
$out = array();
10-
exec('gulp js:eslint', $out);
11-
12-
var_dump($out);
10+
exec('gulp js:validate', $out);
1311

1412
$this->assertTrue(0 < \count($out));
15-
$this->assertTrue(false === \strpos(\implode('|', $out), 'problem'));
13+
14+
$noProblem = false === \strpos(\implode('|', $out), 'problem');
15+
if (!$noProblem)
16+
{
17+
var_dump($out);
18+
}
19+
20+
$this->assertTrue($noProblem);
1621
}
1722
}

0 commit comments

Comments
 (0)