Skip to content

Commit

Permalink
Switch to double-quotes
Browse files Browse the repository at this point in the history
To match style from my work
  • Loading branch information
lkrnac committed Jan 7, 2017
1 parent cd8e5f4 commit 8e4af51
Show file tree
Hide file tree
Showing 13 changed files with 132 additions and 134 deletions.
3 changes: 1 addition & 2 deletions .eslintrc
@@ -1,4 +1,3 @@
{
"extends": "walmart/configurations/es6-node",
"rules": { "quotes": ["error", "single"] }
"extends": "walmart/configurations/es6-node"
}
82 changes: 41 additions & 41 deletions gulpfile.js
@@ -1,27 +1,27 @@
'use strict';
"use strict";

const gulp = require('gulp');
const eslint = require('gulp-eslint');
const plumber = require('gulp-plumber');
const mocha = require('gulp-mocha');
const istanbul = require('gulp-istanbul');
const coveralls = require('gulp-coveralls');
const fsExtra = require('fs-extra');
const path = require('path');
const runSequence = require('run-sequence');
const gulp = require("gulp");
const eslint = require("gulp-eslint");
const plumber = require("gulp-plumber");
const mocha = require("gulp-mocha");
const istanbul = require("gulp-istanbul");
const coveralls = require("gulp-coveralls");
const fsExtra = require("fs-extra");
const path = require("path");
const runSequence = require("run-sequence");

const srcPath = {
dist: 'dist',
server: 'server/**/*.js',
common: 'common/**/*.js',
commonModels: 'common/**/*.json',
serverModels: 'server/**/*.json',
gulpfile: 'gulpfile.js',
serverTests: 'test/**/*.spec.js',
serverBootTests: 'test/**/*.boot.js',
dist: "dist",
server: "server/**/*.js",
common: "common/**/*.js",
commonModels: "common/**/*.json",
serverModels: "server/**/*.json",
gulpfile: "gulpfile.js",
serverTests: "test/**/*.spec.js",
serverBootTests: "test/**/*.boot.js",
package: [
'./!(node_modules|dist)/**/*',
'package.json'
"./!(node_modules|dist)/**/*",
"package.json"
]
};

Expand All @@ -33,11 +33,11 @@ let errorOccurred = false; //eslint-disable-line no-var
* @returns {void}
*/
const watchErrorHandler = (error) => {
console.log('Error occurred... ', error); //eslint-disable-line no-console
console.log("Error occurred... ", error); //eslint-disable-line no-console
errorOccurred = true;
};

gulp.task('lint', () => {
gulp.task("lint", () => {
return gulp.src([
srcPath.common,
srcPath.server,
Expand All @@ -50,15 +50,15 @@ gulp.task('lint', () => {
.pipe(eslint.failAfterError());
});

gulp.task('pre-test', () => {
return gulp.src([srcPath.common, srcPath.server, '!server/server.js'])
gulp.task("pre-test", () => {
return gulp.src([srcPath.common, srcPath.server, "!server/server.js"])
.pipe(istanbul())
.pipe(istanbul.hookRequire());
});

gulp.task('test-boot', (cb) => {
const dbPath = path.resolve(__dirname, 'db.json');
const dbPathBckp = path.resolve(__dirname, 'db.json.bckp');
gulp.task("test-boot", (cb) => {
const dbPath = path.resolve(__dirname, "db.json");
const dbPathBckp = path.resolve(__dirname, "db.json.bckp");
console.log(`db file path: ${dbPath}`); //eslint-disable-line no-console
console.log(`db file backup: ${dbPathBckp}`); //eslint-disable-line no-console

Expand All @@ -75,11 +75,11 @@ gulp.task('test-boot', (cb) => {
gulp.src(srcPath.serverBootTests)
.pipe(plumber({ errorHandler: watchErrorHandler }))
.pipe(mocha())
.on('end', restoreBackup);
.on("end", restoreBackup);
});
});

gulp.task('test-server', () => {
gulp.task("test-server", () => {
return gulp.src(srcPath.serverTests)
.pipe(plumber({ errorHandler: watchErrorHandler }))
.pipe(mocha())
Expand All @@ -96,22 +96,22 @@ gulp.task('test-server', () => {
}));
});

gulp.task('watch', () => {
gulp.task("watch", () => {
gulp.watch([
srcPath.server,
srcPath.serverTests,
srcPath.serverModels,
srcPath.common,
srcPath.commonModels
], ['test']);
], ["test"]);
});

gulp.task('test', (callback) => {
runSequence('pre-test', 'test-boot', 'test-server', callback);
gulp.task("test", (callback) => {
runSequence("pre-test", "test-boot", "test-server", callback);
});

gulp.task('coveralls', () => {
return gulp.src('./coverage/lcov.info')
gulp.task("coveralls", () => {
return gulp.src("./coverage/lcov.info")
.pipe(coveralls());
});

Expand All @@ -123,16 +123,16 @@ gulp.task('coveralls', () => {
*
* More info: https://lkrnac.net/blog/2014/10/watch-file-changes-propagate-errors-gulp
*/
gulp.task('checkError', () => {
gulp.task("checkError", () => {
if (errorOccurred) {
console.log('Error occurred, exiting build process... '); //eslint-disable-line no-console
console.log("Error occurred, exiting build process... "); //eslint-disable-line no-console
process.exit(1); //eslint-disable-line no-process-exit
}
});

gulp.task('default', (callback) => {
runSequence('lint', 'test', 'checkError', callback);
gulp.task("default", (callback) => {
runSequence("lint", "test", "checkError", callback);
});
gulp.task('build', (callback) => {
runSequence('default', 'coveralls', callback);
gulp.task("build", (callback) => {
runSequence("default", "coveralls", callback);
});
2 changes: 1 addition & 1 deletion server/boot/authentication.js
@@ -1,4 +1,4 @@
'use strict';
"use strict";

module.exports = (server) => {
// enable authentication
Expand Down
6 changes: 3 additions & 3 deletions server/boot/sample-models.js
@@ -1,16 +1,16 @@
/* eslint-disable no-console */
'use strict';
"use strict";

const printCreatedUsers = (err, users) => {
if (err) {
throw err;
}

console.log('Created users:', users);
console.log("Created users:", users);
};

const users = [
{username: 'admin', email: 'admin@janodemp.net', password: 'janodemp-default'}
{username: "admin", email: "admin@janodemp.net", password: "janodemp-default"}
];

module.exports = (app) => {
Expand Down
20 changes: 10 additions & 10 deletions server/models/playlist.js
@@ -1,21 +1,21 @@
'use strict';
"use strict";

const fs = require('fs');
const fs = require("fs");

module.exports = function (playlist) {
playlist.track = (callback) => {
fs.stat('playlists/bensound.com-rumble.mp3', (err, stats) => {
const data = fs.createReadStream('playlists/bensound.com-rumble.mp3');
callback(null, data, 'audio/mpeg', stats.size);
fs.stat("playlists/bensound.com-rumble.mp3", (err, stats) => {
const data = fs.createReadStream("playlists/bensound.com-rumble.mp3");
callback(null, data, "audio/mpeg", stats.size);
});
};

playlist.remoteMethod('track', {
http: {path: '/track/', verb: 'get'},
playlist.remoteMethod("track", {
http: {path: "/track/", verb: "get"},
returns: [
{arg: 'body', type: 'file', root: true},
{arg: 'Content-Type', type: 'string', http: { target: 'header' }},
{arg: 'Content-Length', type: 'string', http: { target: 'header' }}
{arg: "body", type: "file", root: true},
{arg: "Content-Type", type: "string", http: { target: "header" }},
{arg: "Content-Length", type: "string", http: { target: "header" }}
]
});
};
2 changes: 1 addition & 1 deletion server/models/user.js
@@ -1,4 +1,4 @@
'use strict';
"use strict";

module.exports = (User) => { //eslint-disable-line no-unused-vars
};
18 changes: 9 additions & 9 deletions server/server.js
@@ -1,20 +1,20 @@
'use strict';
"use strict";

const loopback = require('loopback');
const boot = require('loopback-boot');
const loopback = require("loopback");
const boot = require("loopback-boot");

const app = module.exports = loopback();

/* eslint-disable no-console */
app.start = () => {
// start the web server
return app.listen(() => {
app.emit('started');
const baseUrl = app.get('url').replace(/\/$/, '');
console.log('Web server listening at: %s', baseUrl);
if (app.get('loopback-component-explorer')) {
const explorerPath = app.get('loopback-component-explorer').mountPath;
console.log('Browse your REST API at %s%s', baseUrl, explorerPath);
app.emit("started");
const baseUrl = app.get("url").replace(/\/$/, "");
console.log("Web server listening at: %s", baseUrl);
if (app.get("loopback-component-explorer")) {
const explorerPath = app.get("loopback-component-explorer").mountPath;
console.log("Browse your REST API at %s%s", baseUrl, explorerPath);
}
});
};
Expand Down
3 changes: 1 addition & 2 deletions test/.eslintrc
@@ -1,4 +1,3 @@
{
"extends": "walmart/configurations/es6-test",
"rules": { "quotes": ["error", "single"] }
"extends": "walmart/configurations/es6-test"
}
24 changes: 12 additions & 12 deletions test/boot/sample-models.boot.js
@@ -1,30 +1,30 @@
/* eslint-disable no-magic-numbers */

const assert = require('assert');
const server = require('../test-utils/server-test-helpter');
const assert = require("assert");
const server = require("../test-utils/server-test-helpter");

describe('Application', () => {
describe("Application", () => {
before(server.start);
after(server.stop);

it('should create admin user at start if doesn\'t exist', (done) => {
server.json('post', '/api/users/login')
it("should create admin user at start if doesn't exist", (done) => {
server.json("post", "/api/users/login")
.send({
username: 'admin',
password: 'janodemp-default'
username: "admin",
password: "janodemp-default"
})
.expect(200, (error, response) => {
assert(typeof response.body === 'object');
assert(typeof response.body === "object");
const accessToken = response.body.id;
assert(accessToken, 'must have an access token');
assert(accessToken, "must have an access token");
assert.equal(response.body.userId, 1);

server.json('get', `/api/users?access_token=${accessToken}`)
server.json("get", `/api/users?access_token=${accessToken}`)
.send()
.expect(200, (error2, response2) => {
assert(typeof response2.body === 'object');
assert(typeof response2.body === "object");
assert(response2.body[0].id, 1);
assert(response2.body[0].username, 'admin');
assert(response2.body[0].username, "admin");
done();
});
});
Expand Down
26 changes: 13 additions & 13 deletions test/models/playlist.spec.js
@@ -1,39 +1,39 @@
/* eslint-disable no-magic-numbers */

const assert = require('assert');
const fs = require('fs');
const crypto = require('crypto');
const server = require('../test-utils/server-test-helpter');
const assert = require("assert");
const fs = require("fs");
const crypto = require("crypto");
const server = require("../test-utils/server-test-helpter");

const calculateMd5 = (content) => {
const hash = crypto.createHash('md5').setEncoding('hex');
const hash = crypto.createHash("md5").setEncoding("hex");
content.pipe(hash);
hash.end();
return hash.read();
};

describe('/playlist endpoint', () => {
describe("/playlist endpoint", () => {
before(server.start);
after(server.stop);

it('should not allow access without access token', (done) => {
server.json('get', '/api/playlists')
it("should not allow access without access token", (done) => {
server.json("get", "/api/playlists")
.send()
.expect(401, done);
});

it('responds NOT FOUND for non existing track in current user playlist', (done) => {
server.json('get', '/api/playlists/track/foobar.mp3')
it("responds NOT FOUND for non existing track in current user playlist", (done) => {
server.json("get", "/api/playlists/track/foobar.mp3")
.send()
.expect(404, done);
});

it('responds with track stream for existing track in current user playlist', (done) => {
it("responds with track stream for existing track in current user playlist", (done) => {
server.authenticated((accessToken) => {
server.request('get', `/api/playlists/track?access_token=${accessToken}`)
server.request("get", `/api/playlists/track?access_token=${accessToken}`)
.buffer(false)
.parse((body) => {
const file = fs.createReadStream('playlists/bensound.com-rumble.mp3');
const file = fs.createReadStream("playlists/bensound.com-rumble.mp3");
assert(calculateMd5(body), calculateMd5(file));
})
.expect(200, done);
Expand Down

0 comments on commit 8e4af51

Please sign in to comment.