Skip to content

Commit

Permalink
linter fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
jhchen committed Nov 6, 2017
1 parent 726264a commit 176b66c
Show file tree
Hide file tree
Showing 80 changed files with 4,025 additions and 2,667 deletions.
47 changes: 26 additions & 21 deletions _develop/browsers.js
Original file line number Diff line number Diff line change
@@ -1,44 +1,49 @@
var desktop = {
'mac-chrome-latest' : ['OS X 10.12', 'chrome', '60.0'],
'mac-firefox-latest' : ['OS X 10.12', 'firefox', '54.0'],
'mac-safari-latest' : ['OS X 10.12', 'safari', '10.0'],
'mac-chrome-previous' : ['OS X 10.11', 'chrome', '59.0'],
'mac-firefox-previous' : ['OS X 10.11', 'firefox', '53.0'],
'mac-safari-previous' : ['OS X 10.11', 'safari', '9.0'],
const desktop = {
'mac-chrome-latest': ['OS X 10.12', 'chrome', '60.0'],
'mac-firefox-latest': ['OS X 10.12', 'firefox', '54.0'],
'mac-safari-latest': ['OS X 10.12', 'safari', '10.0'],
'mac-chrome-previous': ['OS X 10.11', 'chrome', '59.0'],
'mac-firefox-previous': ['OS X 10.11', 'firefox', '53.0'],
'mac-safari-previous': ['OS X 10.11', 'safari', '9.0'],

'windows-chrome-latest' : ['Windows 10', 'chrome', '60.0'],
'windows-firefox-latest' : ['Windows 10', 'firefox', '54.0'],
'windows-edge-latest' : ['Windows 10', 'microsoftedge', '15.15063'],
'windows-chrome-previous' : ['Windows 8.1', 'chrome', '59.0'],
'windows-chrome-latest': ['Windows 10', 'chrome', '60.0'],
'windows-firefox-latest': ['Windows 10', 'firefox', '54.0'],
'windows-edge-latest': ['Windows 10', 'microsoftedge', '15.15063'],
'windows-chrome-previous': ['Windows 8.1', 'chrome', '59.0'],
'windows-firefox-previous': ['Windows 8.1', 'firefox', '53.0'],
'windows-edge-previous' : ['Windows 10', 'microsoftedge', '14.14393'],
'windows-edge-previous': ['Windows 10', 'microsoftedge', '14.14393'],
};

var mobile = {
'ios-latest' : ['iPhone 7 Plus', 'iOS', '10.3', 'Safari'],
'ios-previous' : ['iPhone 6 Plus', 'iOS', '9.3', 'Safari'],
const mobile = {
'ios-latest': ['iPhone 7 Plus', 'iOS', '10.3', 'Safari'],
'ios-previous': ['iPhone 6 Plus', 'iOS', '9.3', 'Safari'],

'android-latest' : ['Android GoogleAPI Emulator', 'Android', '7.1', 'Chrome'],
'android-previous' : ['Android GoogleAPI Emulator', 'Android', '6.0', 'Chrome']
'android-latest': ['Android GoogleAPI Emulator', 'Android', '7.1', 'Chrome'],
'android-previous': [
'Android GoogleAPI Emulator',
'Android',
'6.0',
'Chrome',
],
};

Object.keys(desktop).forEach(function(key) {
Object.keys(desktop).forEach(key => {
module.exports[key] = {
base: 'SauceLabs',
browserName: desktop[key][1],
version: desktop[key][2],
platform: desktop[key][0]
platform: desktop[key][0],
};
});

Object.keys(mobile).forEach(function(key) {
Object.keys(mobile).forEach(key => {
module.exports[key] = {
base: 'SauceLabs',
browserName: mobile[key][3],
appiumVersion: '1.6.4',
deviceName: mobile[key][0],
deviceOrientation: 'portrait',
platformVersion: mobile[key][2],
platformName: mobile[key][1]
platformName: mobile[key][1],
};
});
40 changes: 22 additions & 18 deletions _develop/karma.config.js
Original file line number Diff line number Diff line change
@@ -1,21 +1,25 @@
var browsers = require('./browsers');
var sauce = require('./sauce');
const browsers = require('./browsers');
const sauce = require('./sauce');


module.exports = function(config) {
module.exports = config => {
config.set({
basePath: '../',
urlRoot: '/karma/',
port: process.env.npm_package_config_ports_karma,

files: [
{
pattern:
'http://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.7.1/katex.min.js',
served: true,
},
{ pattern: 'dist/quill.snow.css', nocache: true },
{ pattern: 'dist/unit.js', nocache: true },
{ pattern: 'dist/*.map', included: false, served: true, nocache: true },
{ pattern: 'assets/favicon.png', included: false, served: true }
{ pattern: 'assets/favicon.png', included: false, served: true },
],
proxies: {
'/assets/': '/karma/base/assets/'
'/assets/': '/karma/base/assets/',
},

frameworks: ['jasmine'],
Expand All @@ -26,30 +30,28 @@ module.exports = function(config) {
browsers: ['Chrome'],

client: {
useIframe: false
useIframe: false,
},

coverageReporter: {
dir: '.coverage',
reporters: [
{ type: 'text' },
{ type: 'html' }
]
reporters: [{ type: 'text' }, { type: 'html' }],
},
sauceLabs: {
testName: 'quill-unit',
options: {
'public': 'public',
'record-screenshots': false
public: 'public',
'record-screenshots': false,
},
build: sauce.build,
username: sauce.username,
accessKey: sauce.accessKey,
tunnelIdentifier: sauce.tunnel
tunnelIdentifier: sauce.tunnel,
},
customLaunchers: browsers
customLaunchers: browsers,
});

/* eslint-disable no-param-reassign */
if (process.env.TRAVIS) {
config.sauceLabs.startConnect = false;
config.transports = ['polling'];
Expand All @@ -59,9 +61,11 @@ module.exports = function(config) {
config.browserNoActivityTimeout = 60000;
config.captureTimeout = 120000;
// MS Edge does not work in an iframe
if (process.env.BROWSER.indexOf('ios') > -1 ||
process.env.BROWSER.indexOf('android') > -1 ||
process.env.BROWSER.indexOf('firefox') > -1) {
if (
process.env.BROWSER.indexOf('ios') > -1 ||
process.env.BROWSER.indexOf('android') > -1 ||
process.env.BROWSER.indexOf('firefox') > -1
) {
config.client.useIframe = true;
}
}
Expand Down
38 changes: 23 additions & 15 deletions _develop/proxy.js
Original file line number Diff line number Diff line change
@@ -1,33 +1,41 @@
var http = require('http');
var httpProxy = require('http-proxy');
const http = require('http');
const httpProxy = require('http-proxy');

var proxy = httpProxy.createProxyServer({});
var ports = {
proxy: parseInt(process.env.npm_package_config_ports_proxy),
jekyll: parseInt(process.env.npm_package_config_ports_jekyll),
karma: parseInt(process.env.npm_package_config_ports_karma),
webpack: parseInt(process.env.npm_package_config_ports_webpack)
const proxy = httpProxy.createProxyServer({});
const ports = {
proxy: parseInt(process.env.npm_package_config_ports_proxy, 10),
jekyll: parseInt(process.env.npm_package_config_ports_jekyll, 10),
karma: parseInt(process.env.npm_package_config_ports_karma, 10),
webpack: parseInt(process.env.npm_package_config_ports_webpack, 10),
};

var server = http.createServer(function(req, res) {
if (/\/\d+\.\d+\.\d+/.test(req.url) || req.url.startsWith('/karma/base/dist')) {
var target = 'http://localhost:' + ports.webpack + '/' + req.url.split('/').pop();
const server = http.createServer((req, res) => {
if (
/\/\d+\.\d+\.\d+/.test(req.url) ||
req.url.startsWith('/karma/base/dist')
) {
const target = `http://localhost:${ports.webpack}/${req.url
.split('/')
.pop()}`;
proxy.web(req, res, {
ignorePath: true,
target: target
target,
});
} else if (req.url.startsWith('/karma') || req.url === '/assets/favicon.png') {
} else if (
req.url.startsWith('/karma') ||
req.url === '/assets/favicon.png'
) {
proxy.web(req, res, { ignorePath: false, target: { port: ports.karma } });
} else {
proxy.web(req, res, { ignorePath: false, target: { port: ports.jekyll } });
}
});

server.on('upgrade', function (req, socket, head) {
server.on('upgrade', (req, socket, head) => {
proxy.ws(req, socket, head);
});

proxy.on('error', function(e) {
proxy.on('error', e => {
console.error(e);
});

Expand Down
17 changes: 6 additions & 11 deletions _develop/sauce.js
Original file line number Diff line number Diff line change
@@ -1,20 +1,15 @@
var _ = require('lodash');
var os = require('os');

var options = {
username: process.env.SAUCE_USERNAME,
accessKey: process.env.SAUCE_ACCESS_KEY
};
const _ = require('lodash');
const os = require('os');

if (process.env.TRAVIS) {
module.exports = {
build: process.env.TRAVIS_BUILD_ID,
tunnel: process.env.TRAVIS_JOB_NUMBER
tunnel: process.env.TRAVIS_JOB_NUMBER,
};
} else {
var id = _.random(16*16*16*16).toString(16);
const id = _.random(16 * 16 * 16 * 16).toString(16);
module.exports = {
build: os.hostname() + '-' + id,
tunnel: os.hostname() + '-tunnel-' + id
build: `${os.hostname()}-${id}`,
tunnel: `${os.hostname()}-tunnel-${id}`,
};
}
26 changes: 14 additions & 12 deletions _develop/wdio.config.js
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
exports.config = {
specs: [
'./test/functional/epic.js'
],
specs: ['./test/functional/epic.js'],
exclude: [],

reporters: ['spec'],

maxInstances: 10,
capabilities: [{
browserName: 'chrome'
}],
capabilities: [
{
browserName: 'chrome',
},
],

sync: true,
logLevel: 'error',
coloredLogs: true,

baseUrl: 'http://localhost:' + process.env.npm_package_config_ports_proxy,
baseUrl: `http://localhost:${process.env.npm_package_config_ports_proxy}`,

waitforTimeout: 10000,
connectionRetryTimeout: 90000,
Expand All @@ -24,9 +24,11 @@ exports.config = {
framework: 'jasmine',
jasmineNodeOpts: {
defaultTimeoutInterval: 10000,
expectationResultHandler: function(passed, assertion) {
expectationResultHandler: passed => {
if (passed) return;
this.saveScreenshot('./wd-' + this.desiredCapabilities.browserName + '-error.png');
}
}
}
this.saveScreenshot(
`./wd-${this.desiredCapabilities.browserName}-error.png`,
);
},
},
};
Loading

0 comments on commit 176b66c

Please sign in to comment.