Skip to content

Commit

Permalink
lint
Browse files Browse the repository at this point in the history
  • Loading branch information
@shakyShane
shakyShane committed Oct 7, 2016
1 parent 54be976 commit 9c998f7
Show file tree
Hide file tree
Showing 8 changed files with 30 additions and 34 deletions.
14 changes: 7 additions & 7 deletions lib/browser-sync.js
View file
Expand Up @@ -423,7 +423,7 @@ BrowserSync.prototype.addMiddleware = function (route, handle, opts) {
entry.override = true;
}

bs.options = bs.options.update('middleware', function (mw) {
bs.options = bs.options.update("middleware", function (mw) {
return mw.concat(entry);
});

Expand All @@ -443,14 +443,14 @@ BrowserSync.prototype.removeMiddleware = function (id) {
return;
}

bs.options = bs.options.update('middleware', function (mw) {
bs.options = bs.options.update("middleware", function (mw) {
return mw.filter(function (mw) {
return mw.id !== id;
});
});
};


bs.resetMiddlewareStack();
};

/**
* Middleware for socket connection (external usage)
Expand Down Expand Up @@ -591,7 +591,7 @@ BrowserSync.prototype.setMany = function (fn, opts) {
BrowserSync.prototype.addRewriteRule = function (rule) {
var bs = this;

bs.options = bs.options.update('rewriteRules', function (rules) {
bs.options = bs.options.update("rewriteRules", function (rules) {
return rules.concat(rule);
});

Expand All @@ -600,7 +600,7 @@ BrowserSync.prototype.addRewriteRule = function (rule) {

BrowserSync.prototype.removeRewriteRule = function (id) {
var bs = this;
bs.options = bs.options.update('rewriteRules', function (rules) {
bs.options = bs.options.update("rewriteRules", function (rules) {
return rules.filter(function (rule) {
return rule.id !== id;
});
Expand All @@ -615,7 +615,7 @@ BrowserSync.prototype.removeRewriteRule = function (id) {
BrowserSync.prototype.resetMiddlewareStack = function () {

var bs = this;
var middlewares = require('./server/utils').getMiddlewares(bs, bs.options);
var middlewares = require("./server/utils").getMiddlewares(bs, bs.options);

bs.app.stack = middlewares;
};
Expand Down
2 changes: 1 addition & 1 deletion lib/server/proxy-server.js
View file
Expand Up @@ -72,7 +72,7 @@ module.exports = function createProxyServer (bs) {
var proxyReq = getProxyReqFunctions(opt.get("proxyReq"), opt, bs);
var proxyRes = getProxyResFunctions(opt.get("proxyRes"), opt);
var proxyResWs = opt.get("proxyReqWs");
bs.options = bs.options.update('middleware', function (mw) {
bs.options = bs.options.update("middleware", function (mw) {
return mw.concat({
id: "Browsersync Proxy",
route: opt.get("route"),
Expand Down
5 changes: 2 additions & 3 deletions lib/server/utils.js
View file
Expand Up @@ -71,7 +71,7 @@ var serverUtils = {

var defaultMiddlewares = [
{
id: 'Browsersync HTTP Protocol',
id: "Browsersync HTTP Protocol",
route: require("../config").httpProtocol.path,
handle: require("../http-protocol").middleware(bs)
},
Expand Down Expand Up @@ -193,7 +193,6 @@ var serverUtils = {
var whitelist = List([])
.concat(bs.options.getIn(["snippetOptions", "whitelist"]));


// Snippet
rules.push(snippetUtils.getRegex(bs.options.get("snippet"), bs.options.get("snippetOptions")));

Expand All @@ -204,7 +203,7 @@ var serverUtils = {
}

// User
bs.options.get('rewriteRules').forEach(function (rule) {
bs.options.get("rewriteRules").forEach(function (rule) {
if (Map.isMap(rule)) {
rules.push(rule.toJS());
}
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Expand Up @@ -67,7 +67,7 @@
"chai": "3.5.0",
"chalk": "1.1.3",
"compression": "1.6.2",
"eslint": "3.4.0",
"eslint": "3.7.1",
"graceful-fs": "4.1.6",
"gulp": "3.9.1",
"gulp-contribs": "0.0.3",
Expand Down
4 changes: 2 additions & 2 deletions test/specs/e2e/middleware/middleware.option.js
View file
Expand Up @@ -33,7 +33,7 @@ describe("Accepting middleware as an option (1)", function () {
});

it("should accept middlewares when given as top-level", function () {
assert.equal(bs.options.get("middleware").size, 2, '1 custom + 1 serve static');
assert.equal(bs.options.get("middleware").size, 2, "1 custom + 1 serve static");
});
});

Expand Down Expand Up @@ -69,7 +69,7 @@ describe("Accepting middleware as an option (2)", function () {
});

it("should accept middlewares when given as top-level", function () {
assert.equal(bs.options.get("middleware").size, 3, '2 custom + 1 serve static');
assert.equal(bs.options.get("middleware").size, 3, "2 custom + 1 serve static");
});
});

Expand Down
28 changes: 14 additions & 14 deletions test/specs/e2e/proxy/e2e.proxy.rewrite.rules.add.js
View file
Expand Up @@ -7,7 +7,7 @@ var serveStatic = require("serve-static");
var request = require("supertest");
var assert = require("chai").assert;
var Rx = require("rx");
var utils = require('../../../utils');
var utils = require("../../../utils");

describe("E2E proxy test with adding rewrite rules dynamically", function () {

Expand All @@ -19,9 +19,9 @@ describe("E2E proxy test with adding rewrite rules dynamically", function () {
var server = app.listen();
var proxytarget = "http://localhost:" + server.address().port;

app.use('/index.html', function (req, res) {
res.setHeader('content-type', 'text/html');
res.end('<a href="'+proxytarget+'/my-link">Browsersync</a>');
app.use("/index.html", function (req, res) {
res.setHeader("content-type", "text/html");
res.end("<a href=\""+proxytarget+"/my-link\">Browsersync</a>");
});

var config = {
Expand All @@ -41,7 +41,7 @@ describe("E2E proxy test with adding rewrite rules dynamically", function () {
browserSync.init([], config, function (err, bs) {

var reqs = utils.getRequests([
['/index.html', '<a href="//127.0.0.1:3000/my-link">BROWSERSYNC</a>']
["/index.html", "<a href=\"//127.0.0.1:3000/my-link\">BROWSERSYNC</a>"]
], bs.server);

var obs = Rx.Observable.concat(reqs);
Expand All @@ -62,9 +62,9 @@ describe("E2E proxy test with adding rewrite rules dynamically", function () {
var server = app.listen();
var proxytarget = "http://localhost:" + server.address().port;

app.use('/index.html', function (req, res) {
res.setHeader('content-type', 'text/html');
res.end('<a href="'+proxytarget+'/my-link">Browsersync</a>');
app.use("/index.html", function (req, res) {
res.setHeader("content-type", "text/html");
res.end("<a href=\""+proxytarget+"/my-link\">Browsersync</a>");
});

var config = {
Expand All @@ -84,19 +84,19 @@ describe("E2E proxy test with adding rewrite rules dynamically", function () {
browserSync.init([], config, function (err, bs) {

var reqs = utils.getRequests([
['/index.html', '<a href="//127.0.0.1:3000/my-link">BROWSERSYNC</a>'],
["/index.html", "<a href=\"//127.0.0.1:3000/my-link\">BROWSERSYNC</a>"],
function () {
bs.addRewriteRule({
match: /BROWSERSYNC/,
replace: 'shane',
id: 'my-rewrite-rule'
replace: "shane",
id: "my-rewrite-rule"
});
},
['/index.html', '<a href="//127.0.0.1:3000/my-link">shane</a>'],
["/index.html", "<a href=\"//127.0.0.1:3000/my-link\">shane</a>"],
function () {
bs.removeRewriteRule('my-rewrite-rule');
bs.removeRewriteRule("my-rewrite-rule");
},
['/index.html', '<a href="//127.0.0.1:3000/my-link">BROWSERSYNC</a>']
["/index.html", "<a href=\"//127.0.0.1:3000/my-link\">BROWSERSYNC</a>"]
], bs.server);

var obs = Rx.Observable.concat(reqs);
Expand Down
4 changes: 2 additions & 2 deletions test/specs/e2e/proxy/e2e.proxy.rewrite.rules.replace.js
View file
Expand Up @@ -55,8 +55,8 @@ describe("E2E proxy test with replacing rewrite rules dynamically", function ()

assert.include(res.text, "BROWSERSYNC");

bs.options = bs.options.update('rewriteRules', function () {
return require('immutable').List([]);
bs.options = bs.options.update("rewriteRules", function () {
return require("immutable").List([]);
});

bs.resetMiddlewareStack();
Expand Down
5 changes: 1 addition & 4 deletions test/specs/plugins/hooks.js
View file
Expand Up @@ -62,10 +62,7 @@ describe("Plugins: Registering Hooks:", function () {
it("adds an item to the clientEvents array", function () {
assert.include(instance.options.get("clientEvents").toJS(), "cp:goto");
});
it("adds an item to the Server Middleware array", function () {
assert.include(instance.clientJs, "SHANE123456");
});
it("adds an item to the Server Middleware array", function (done) {
it("adds an item to the Server Middleware array (2)", function (done) {

request(instance.server)
.get("/")
Expand Down

0 comments on commit 9c998f7

Please sign in to comment.