Skip to content

Commit

Permalink
Removed remaining anonymous functions with arrow functions
Browse files Browse the repository at this point in the history
  • Loading branch information
@hknustwmf
hknustwmf committed Jan 24, 2019
1 parent b4c85ee commit 428e6fb
Show file tree
Hide file tree
Showing 7 changed files with 47 additions and 47 deletions.
2 changes: 1 addition & 1 deletion maintenance/keyspace_name.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ if (argv.h) {
}

var conf = getConfig(argv.config);
var db = new DB({}, { conf: conf, log: function () {} });
var db = new DB({}, { conf: conf, log: () => {} });
console.log(db.keyspaceName(argv.domain, argv.table));

process.exit(0);
8 changes: 4 additions & 4 deletions scripts/dumpReader.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,18 +103,18 @@ module.exports.DumpReader = DumpReader;

if (module === require.main) {
var reader = new DumpReader();
reader.on('end', function () {
reader.on('end', () => {
console.log('done!');
process.exit();
});
reader.on('error', function (err) {
reader.on('error', (err) => {
console.log('error!', err);
process.exit(1);
});
reader.on('page', function (page) {
reader.on('page', (page) => {
console.log('page', page);
});
reader.on('revision', function (revision) {
reader.on('revision', (revision) => {
revision.text = revision.text.substr(0, 40);
console.log('revision', revision);
});
Expand Down
18 changes: 9 additions & 9 deletions test/functional/backend_migrations.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,35 +24,35 @@ var testTable0 = {
]
};

describe('Backend migration', function() {
describe('Backend migration', () => {
var db;
before(function() {
before(() => {
return makeClient({
log: function(level, info) {
log: (level, info) => {
if (!/^info|warn|verbose|debug|trace/.test(level)) {
console.log(level, info);
}
},
conf: yaml.safeLoad(fs.readFileSync(__dirname + '/../utils/test_client.conf.yaml'))
})
.then(function(newDb) {
.then((newDb) => {
db = newDb;
})
.then(function() {
.then(() => {
return db.createTable('restbase.cassandra.test.local', testTable0);
})
.then(function(response) {
.then((response) => {
assert.ok(response, 'undefined response');
assert.deepEqual(response.status, 201);
});
});
after(function() {
after(() => {
db.dropTable('restbase.cassandra.test.local', testTable0.table);
});

it('persists a backend version', function() {
it('persists a backend version', () => {
return db.getTableSchema('restbase.cassandra.test.local', testTable0.table)
.then(function(response) {
.then((response) => {
assert.ok(response, 'undefined response');
assert.deepEqual(response.schema.table, testTable0.table);
assert.deepEqual(response.schema._backend_version, dbu.CURRENT_BACKEND_VERSION);
Expand Down
30 changes: 15 additions & 15 deletions test/functional/config_migrations.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,71 +23,71 @@ var testTable0 = {
]
};

describe('Configuration migration', function() {
describe('Configuration migration', () => {
var db;
before(function() {
before(() => {
return makeClient({
log: function(level, info) {
log: (level, info) => {
if (!/^info|warn|verbose|debug|trace/.test(level)) {
console.log(level, info);
}
},
conf: yaml.safeLoad(fs.readFileSync(__dirname + '/../utils/test_client.conf.yaml'))
})
.then(function(newDb) {
.then((newDb) => {
db = newDb;
})
.then(function() {
.then(() => {
return db.createTable('restbase.cassandra.test.local', testTable0);
})
.then(function(response) {
.then((response) => {
assert.ok(response, 'undefined response');
assert.deepEqual(response.status, 201);
});
});
after(function() {
after(() => {
return db.dropTable('restbase.cassandra.test.local', testTable0.table);
});

it('migrates version', function() {
it('migrates version', () => {
return db.getTableSchema('restbase.cassandra.test.local', testTable0.table)
.then(function(response) {
.then((response) => {
assert.ok(response, 'undefined response');
assert.deepEqual(response.schema.table, testTable0.table);
assert.deepEqual(response.schema._config_version, 1);

db.conf.version = 2;
return db.createTable('restbase.cassandra.test.local', testTable0);
})
.then(function(response) {
.then((response) => {
assert.ok(response, 'undefined response');
assert.deepEqual(response.status, 201);

return db.getTableSchema('restbase.cassandra.test.local', testTable0.table);
})
.then(function(response) {
.then((response) => {
assert.ok(response, 'undefined response');
assert.deepEqual(response.schema.table, testTable0.table);
assert.deepEqual(response.schema._config_version, 2);
});
});

it('disallows decreasing versions', function() {
it('disallows decreasing versions', () => {
// Migrate version (from 1) to 2.
db.conf.version = 2;
return db.createTable('restbase.cassandra.test.local', testTable0)
.then(function(response) {
.then((response) => {
assert.ok(response, 'undefined response');
assert.deepEqual(response.status, 201);

// Attempt to downgrade version (from 2) to 1
db.conf.version = 1;
return db.createTable('restbase.cassandra.test.local', testTable0)
.then(function(response) {
.then((response) => {
// A successful response means a downgrade happened (this is wrong).
assert.fail(response, undefined, 'expected HTTPError exception');
})
.catch(function(error) {
.catch((error) => {
// This is what we want, an HTTPError and status 400.
assert.deepEqual(error.status, 400);
});
Expand Down
20 changes: 10 additions & 10 deletions test/functional/replication.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,44 +22,44 @@ var testTable0 = {
],
};

describe('Table creation', function() {
describe('Table creation', () => {
var db;
before(function() {
before(() => {
return makeClient({
log: function(level, info) {
log: (level, info) => {
if (/^error|fatal/.test(level)) {
console.log(level, info);
}
},
conf: yaml.safeLoad(fs.readFileSync(__dirname + '/../utils/test_client.conf.yaml'))
})
.then(function(newDb) {
.then((newDb) => {
db = newDb;
return db.createTable('restbase.cassandra.test.local', testTable0);
})
.then(function(response) {
.then((response) => {
assert.ok(response, 'undefined response');
assert.deepEqual(response.status, 201);
});
});
after(function() {
after(() => {
db.dropTable('restbase.cassandra.test.local', testTable0.table);
});

it('updates Cassandra replication', function() {
it('updates Cassandra replication', () => {
return db._getReplication('restbase.cassandra.test.local', testTable0.table)
.then(function(response) {
.then((response) => {
assert.ok(response, 'undefined response');
assert.strictEqual(Object.keys(response).length, 1, 'incorrect number of results');

// Add one datacenter, and update.
db.conf.datacenters.push('new_dc');
return db.updateReplicationIfNecessary('restbase.cassandra.test.local', testTable0.table);
})
.then(function() {
.then(() => {
return db._getReplication('restbase.cassandra.test.local', testTable0.table);
})
.then(function(response) {
.then((response) => {
assert.ok(response, 'undefined response');
assert.strictEqual(Object.keys(response).length, 2, 'incorrect number of results');
assert.ok(response.new_dc, 'additional datacenter not present');
Expand Down
2 changes: 1 addition & 1 deletion test/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ describe('Functional', () => {
const dbConstructor = require('../index.js');
require('restbase-mod-table-spec').test(() => dbConstructor({
conf: conf,
log: function () {
log: () => {
}
}));
});
14 changes: 7 additions & 7 deletions test/unit/dbutils.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ var testTable0b = {
]
};

describe('DB utilities', function() {
describe('DB utilities', () => {

it('builds SELECTs with included TTLs', function() {
it('builds SELECTs with included TTLs', () => {
var req = {
keyspace: 'keyspace',
columnfamily: 'columnfamily',
Expand All @@ -57,16 +57,16 @@ describe('DB utilities', function() {

assert(match.length === 2, 'result has no matching projection');

var projs = match[1].split(',').map(function(i) { return i.trim(); });
var projs = match[1].split(',').map((i) => { return i.trim(); });

var exp = /TTL\((.+)\) as "_ttl_(.+)"/;

// There should be 7 non-ttl attributes total.
assert(projs.filter(function(v) { return !exp.test(v); }).length === 7);
assert(projs.filter((v) => { return !exp.test(v); }).length === 7);

var matching = [];
projs.filter(function(v) { return exp.test(v); }).forEach(
function(v) {
projs.filter((v) => { return exp.test(v); }).forEach(
(v) => {
var v1 = v.match(exp)[1];
var v2 = v.match(exp)[2];
assert.deepEqual(v1, dbu.cassID(v2));
Expand All @@ -80,7 +80,7 @@ describe('DB utilities', function() {
assert.deepEqual(matching.sort(), ["author", "comment"]);
});

it('builds SELECTS with an included LIMIT', function() {
it('builds SELECTS with an included LIMIT', () => {
var req = {
keyspace: 'keyspace',
columnfamily: 'columnfamily',
Expand Down

0 comments on commit 428e6fb

Please sign in to comment.