You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ra...@apache.org on 2019/10/30 07:37:28 UTC
[cordova-serve] branch master updated: Improve linting (#19)
This is an automated email from the ASF dual-hosted git repository.
raphinesse pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cordova-serve.git
The following commit(s) were added to refs/heads/master by this push:
new f1ffa65 Improve linting (#19)
f1ffa65 is described below
commit f1ffa6572f8f0f77d266218e86b17201d963d8bb
Author: Raphael von der Grün <ra...@gmail.com>
AuthorDate: Wed Oct 30 08:37:20 2019 +0100
Improve linting (#19)
* Remove legacy linting configuration
* Lint everything
* Fix violations via eslint --fix
* Manually fix remaining eslint violations
---
.jscs.json | 24 --------------------
.jshintrc | 11 ---------
package.json | 2 +-
spec/.eslintrc.yml | 2 ++
spec/browser.spec.js | 64 ++++++++++++++++++++++++++--------------------------
spec/main.spec.js | 10 ++++----
spec/server.spec.js | 23 +++++++------------
7 files changed, 48 insertions(+), 88 deletions(-)
diff --git a/.jscs.json b/.jscs.json
deleted file mode 100644
index 64b1d67..0000000
--- a/.jscs.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "disallowMixedSpacesAndTabs": true,
- "disallowTrailingWhitespace": true,
- "validateLineBreaks": "LF",
- "validateIndentation": 4,
- "requireLineFeedAtFileEnd": true,
-
- "disallowSpaceAfterPrefixUnaryOperators": true,
- "disallowSpaceBeforePostfixUnaryOperators": true,
- "requireSpaceAfterLineComment": true,
- "requireCapitalizedConstructors": true,
-
- "disallowSpacesInNamedFunctionExpression": {
- "beforeOpeningRoundBrace": true
- },
-
- "requireSpaceAfterKeywords": [
- "if",
- "else",
- "for",
- "while",
- "do"
- ]
-}
\ No newline at end of file
diff --git a/.jshintrc b/.jshintrc
deleted file mode 100644
index 6997763..0000000
--- a/.jshintrc
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "node": true,
- "bitwise": true,
- "undef": true,
- "trailing": true,
- "quotmark": true,
- "indent": 4,
- "unused": "vars",
- "latedef": "nofunc",
- "-W030": false
-}
diff --git a/package.json b/package.json
index ff17e89..40005ff 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
"main": "src/main.js",
"scripts": {
"jasmine": "jasmine JASMINE_CONFIG_PATH=spec/jasmine.json",
- "eslint": "node node_modules/eslint/bin/eslint ./src",
+ "eslint": "eslint .",
"test": "npm run eslint && npm run jasmine"
},
"repository": {
diff --git a/spec/.eslintrc.yml b/spec/.eslintrc.yml
new file mode 100644
index 0000000..043fd14
--- /dev/null
+++ b/spec/.eslintrc.yml
@@ -0,0 +1,2 @@
+env:
+ jasmine: true
diff --git a/spec/browser.spec.js b/spec/browser.spec.js
index ccd0307..79f68ea 100644
--- a/spec/browser.spec.js
+++ b/spec/browser.spec.js
@@ -14,84 +14,84 @@
specific language governing permissions and limitations
under the License.
*/
-var child_process = require('child_process');
+
var rewire = require('rewire');
-var browser = rewire("../src/browser");
-var regItemPattern = browser.__get__("regItemPattern");
+var browser = rewire('../src/browser');
+var regItemPattern = browser.__get__('regItemPattern');
-function expectPromise(obj){
+function expectPromise (obj) {
// 3 slightly different ways of verifying a promise
expect(typeof obj.then).toBe('function');
expect(obj instanceof Promise).toBe(true);
expect(obj).toBe(Promise.resolve(obj));
}
-describe('browser', function() {
+describe('browser', function () {
- it('exists and has expected properties', function() {
+ it('exists and has expected properties', function () {
expect(browser).toBeDefined();
expect(typeof browser).toBe('function');
});
- it('should return a promise', function(done) {
+ it('should return a promise', function (done) {
var mockOpen = jasmine.createSpy('mockOpen');
var origOpen = browser.__get__('open'); // so we can be nice and restore it later
- browser.__set__('open',mockOpen);
+ browser.__set__('open', mockOpen);
var result = browser();
expect(result).toBeDefined();
expectPromise(result);
-
- result.then(function(res) {
+
+ result.then(function (res) {
browser.__set__('open', origOpen);
done();
})
- .catch(function(err) {
- browser.__set__('open', origOpen);
- done(err);
- });
+ .catch(function (err) {
+ browser.__set__('open', origOpen);
+ done(err);
+ });
});
- it('should call open() when target is `default`', function(done) {
+ it('should call open() when target is `default`', function (done) {
var mockOpen = jasmine.createSpy('mockOpen');
var origOpen = browser.__get__('open'); // so we can be nice and restore it later
- browser.__set__('open',mockOpen);
+ browser.__set__('open', mockOpen);
var mockUrl = 'this is the freakin url';
- var result = browser({target:'default',url:mockUrl});
+ var result = browser({ target: 'default', url: mockUrl });
expect(result).toBeDefined();
expectPromise(result);
-
- result.then(function(res) {
+
+ result.then(function (res) {
expect(mockOpen).toHaveBeenCalledWith(mockUrl);
browser.__set__('open', origOpen);
done();
})
- .catch(function(err) {
- browser.__set__('open', origOpen);
- done(err);
- });
+ .catch(function (err) {
+ browser.__set__('open', origOpen);
+ done(err);
+ });
});
- it('should recognize browser from registry with key "Default" on English Windows 10', function(done) {
- var result = regItemPattern.exec("HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\chrome.EXE (Default) REG_SZ C:\\Program Files (x86)\\Google\\Chrome\\Application\\chrome.exe");
- expect(result[2]).toBe("C:\\Program Files (x86)\\Google\\Chrome\\Application\\chrome.exe")
+ it('should recognize browser from registry with key "Default" on English Windows 10', function (done) {
+ var result = regItemPattern.exec('HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\chrome.EXE (Default) REG_SZ C:\\Program Files (x86)\\Google\\Chrome\\Application\\chrome.exe');
+ expect(result[2]).toBe('C:\\Program Files (x86)\\Google\\Chrome\\Application\\chrome.exe');
done();
});
- it('should recognize browser from registry with key "Standard" on non-English Windows 10', function(done) {
- var result = regItemPattern.exec("HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\chrome.EXE (Standard) REG_SZ C:\\Program Files (x86)\\Google\\Chrome\\Application\\chrome.exe");
- expect(result[2]).toBe("C:\\Program Files (x86)\\Google\\Chrome\\Application\\chrome.exe")
+ it('should recognize browser from registry with key "Standard" on non-English Windows 10', function (done) {
+ var result = regItemPattern.exec('HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\chrome.EXE (Standard) REG_SZ C:\\Program Files (x86)\\Google\\Chrome\\Application\\chrome.exe');
+ expect(result[2]).toBe('C:\\Program Files (x86)\\Google\\Chrome\\Application\\chrome.exe');
done();
});
- it('should recognize browser with non-Latin registry key on Russian Windows 10', function(done) {
- var result = regItemPattern.exec("HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\chrome.EXE (�� 㬮�砭��) REG_SZ C:\\Program Files (x86)\\Google\\Chrome\\Application\\chrome.exe");
- expect(result[2]).toBe("C:\\Program Files (x86)\\Google\\Chrome\\Application\\chrome.exe")
+ it('should recognize browser with non-Latin registry key on Russian Windows 10', function (done) {
+ var result = regItemPattern.exec('HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\chrome.EXE (�� 㬮�砭��) REG_SZ C:\\Program Files (x86)\\Google\\Chrome\\Application\\chrome.exe');
+ expect(result[2]).toBe('C:\\Program Files (x86)\\Google\\Chrome\\Application\\chrome.exe');
done();
});
});
diff --git a/spec/main.spec.js b/spec/main.spec.js
index b9acb5d..f94f14e 100644
--- a/spec/main.spec.js
+++ b/spec/main.spec.js
@@ -15,17 +15,17 @@
under the License.
*/
-var main = require("..");
+var main = require('..');
-describe('main', function() {
+describe('main', function () {
- it('exists and has expected properties', function() {
+ it('exists and has expected properties', function () {
expect(main).toBeDefined();
expect(main.Router).toBeDefined();
expect(main.static).toBeDefined();
});
- it('is creatable',function() {
+ it('is creatable', function () {
var instance = main();
expect(instance.servePlatform).toBeDefined();
expect(typeof instance.servePlatform).toBe('function');
@@ -36,4 +36,4 @@ describe('main', function() {
expect(instance.launchBrowser).toBeDefined();
expect(typeof instance.launchBrowser).toBe('function');
});
-});
\ No newline at end of file
+});
diff --git a/spec/server.spec.js b/spec/server.spec.js
index f1b056a..d36d512 100644
--- a/spec/server.spec.js
+++ b/spec/server.spec.js
@@ -15,33 +15,26 @@
under the License.
*/
-var server = require("../src/server");
+var server = require('../src/server');
-function expectPromise(obj){
+function expectPromise (obj) {
// 3 slightly different ways of verifying a promise
expect(typeof obj.then).toBe('function');
expect(obj instanceof Promise).toBe(true);
expect(obj).toBe(Promise.resolve(obj));
}
-describe('server', function() {
+describe('server', function () {
- it('exists and has expected properties', function() {
+ it('exists and has expected properties', function () {
expect(server).toBeDefined();
expect(typeof server).toBe('function');
});
- it('should return a promise', function(done) {
- var result = server({port:8008,noServerInfo:1});
+ it('should return a promise', function (done) {
+ var result = server({ port: 8008, noServerInfo: 1 });
expect(result).toBeDefined();
expectPromise(result);
- result.then(function(res) {
- // console.log("success : " + res);
- done();
- });
- result.catch(function(err){
- // console.log("error : " + err);
- done();
- });
+ result.then(done, done);
});
-});
\ No newline at end of file
+});
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org