s/by/for
This commit is contained in:
+4
-4
@@ -12,8 +12,8 @@ exports = module.exports = {
|
||||
getGroup: getGroup,
|
||||
getAlias: getAlias,
|
||||
|
||||
getAliasesByName: getAliasesByName,
|
||||
setAliasesByName: setAliasesByName,
|
||||
getAliasesForName: getAliasesForName,
|
||||
setAliasesForName: setAliasesForName,
|
||||
|
||||
getByOwnerId: getByOwnerId,
|
||||
delByOwnerId: delByOwnerId,
|
||||
@@ -139,7 +139,7 @@ function getByOwnerId(ownerId, callback) {
|
||||
});
|
||||
}
|
||||
|
||||
function setAliasesByName(name, aliases, callback) {
|
||||
function setAliasesForName(name, aliases, callback) {
|
||||
assert.strictEqual(typeof name, 'string');
|
||||
assert(util.isArray(aliases));
|
||||
assert.strictEqual(typeof callback, 'function');
|
||||
@@ -164,7 +164,7 @@ function setAliasesByName(name, aliases, callback) {
|
||||
});
|
||||
}
|
||||
|
||||
function getAliasesByName(name, callback) {
|
||||
function getAliasesForName(name, callback) {
|
||||
assert.strictEqual(typeof name, 'string');
|
||||
assert.strictEqual(typeof callback, 'function');
|
||||
|
||||
|
||||
@@ -1225,14 +1225,14 @@ describe('database', function () {
|
||||
});
|
||||
|
||||
it('can set alias', function (done) {
|
||||
mailboxdb.setAliasesByName('support', [ 'support2', 'help' ], function (error) {
|
||||
mailboxdb.setAliasesForName('support', [ 'support2', 'help' ], function (error) {
|
||||
expect(error).to.be(null);
|
||||
done();
|
||||
});
|
||||
});
|
||||
|
||||
it('can get aliases of name', function (done) {
|
||||
mailboxdb.getAliasesByName('support', function (error, results) {
|
||||
mailboxdb.getAliasesForName('support', function (error, results) {
|
||||
expect(error).to.be(null);
|
||||
expect(results.length).to.be(2);
|
||||
expect(results[0]).to.be('help');
|
||||
@@ -1273,10 +1273,10 @@ describe('database', function () {
|
||||
});
|
||||
|
||||
it('unset aliases', function (done) {
|
||||
mailboxdb.setAliasesByName('support', [ ], function (error) {
|
||||
mailboxdb.setAliasesForName('support', [ ], function (error) {
|
||||
expect(error).to.be(null);
|
||||
|
||||
mailboxdb.getAliasesByName('support', function (error, results) {
|
||||
mailboxdb.getAliasesForName('support', function (error, results) {
|
||||
expect(error).to.be(null);
|
||||
expect(results.length).to.be(0);
|
||||
done();
|
||||
|
||||
@@ -898,7 +898,7 @@ describe('User', function () {
|
||||
user.setAliases(userObject.id, [ 'everything', 'is', 'awesome' ], function (error) {
|
||||
expect(error).to.be(null);
|
||||
|
||||
mailboxdb.getAliasesByName(USERNAME.toLowerCase(), function (error, results) {
|
||||
mailboxdb.getAliasesForName(USERNAME.toLowerCase(), function (error, results) {
|
||||
expect(error).to.be(null);
|
||||
expect(results.length).to.be(3);
|
||||
done();
|
||||
@@ -917,7 +917,7 @@ describe('User', function () {
|
||||
mailboxdb.getMailbox(userObject.username.toLowerCase(), function (error, mailbox) {
|
||||
expect(error.reason).to.be(DatabaseError.NOT_FOUND);
|
||||
|
||||
mailboxdb.getAliasesByName(USERNAME.toLowerCase(), function (error, results) {
|
||||
mailboxdb.getAliasesForName(USERNAME.toLowerCase(), function (error, results) {
|
||||
expect(error).to.be(null);
|
||||
expect(results.length).to.be(0);
|
||||
done();
|
||||
|
||||
+2
-2
@@ -590,7 +590,7 @@ function setAliases(userId, aliases, callback) {
|
||||
|
||||
if (!user.username) return new UserError(UserError.BAD_FIELD, 'Username must be set before settings aliases');
|
||||
|
||||
mailboxdb.setAliasesByName(user.username, aliases, function (error) {
|
||||
mailboxdb.setAliasesForName(user.username, aliases, function (error) {
|
||||
if (error && error.reason === DatabaseError.ALREADY_EXISTS) return callback(new UserError(UserError.ALREADY_EXISTS, error.message));
|
||||
if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new UserError(UserError.NOT_FOUND));
|
||||
if (error) return callback(new UserError(UserError.INTERNAL_ERROR, error));
|
||||
@@ -608,7 +608,7 @@ function getAliases(userId, callback) {
|
||||
if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new UserError(UserError.NOT_FOUND));
|
||||
if (error) return callback(new UserError(UserError.INTERNAL_ERROR, error));
|
||||
|
||||
mailboxdb.getAliasesByName(user.username, function (error, aliases) {
|
||||
mailboxdb.getAliasesForName(user.username, function (error, aliases) {
|
||||
if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new UserError(UserError.NOT_FOUND));
|
||||
if (error) return callback(new UserError(UserError.INTERNAL_ERROR, error));
|
||||
|
||||
|
||||
Reference in New Issue
Block a user