Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[ECHOJS-227] fixed tests with lint #143

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
Open

[ECHOJS-227] fixed tests with lint #143

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
cbc4501
fixed tests with lint
alesPoz Nov 20, 2019
5548776
fixed tests with lint checking
alesPoz Nov 21, 2019
e648c72
fixed tests with lint pathes
alesPoz Nov 21, 2019
ec8f636
fixed tests
alesPoz Nov 21, 2019
63e5074
fixed tests lint
alesPoz Nov 21, 2019
853ca5e
Merge remote-tracking branch 'origin/master' into ECHOJS-227
alesPoz Nov 21, 2019
f7c9ea3
check fixes
alesPoz Nov 21, 2019
f4dbf67
fixed tests complete
alesPoz Nov 21, 2019
72ddae8
Merge remote-tracking branch 'origin/master' into ECHOJS-227
alesPoz Nov 27, 2019
f14e19a
fixing lint
alesPoz Nov 27, 2019
bcbb3ba
fixed lint issues
alesPoz Nov 27, 2019
dc2b308
Merge remote-tracking branch 'origin/master' into ECHOJS-227
alesPoz Nov 27, 2019
2636bd2
fixed lint
alesPoz Nov 27, 2019
36916f6
fixing issues
alesPoz Nov 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .eslintignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
node_modules/*
dist/*
test/*
scripts/*
14 changes: 12 additions & 2 deletions .eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@ module.exports = {
"extends": "airbnb",
"env": {
"browser": false,
"jest": true
"jest": true,
"mocha": true,
},
"plugins": [
"import"
],
"rules": {
"global-require": 0,
Comment on lines +6 to +12
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use this eslint rules only for test folder. And disable this rule for tests too.

"overrides": [{
	"files": ["test/**/*.js"],
	"env": { "mocha": true },
	"rules": { "func-names": 0, "global-require": 0 },
}],

"arrow-parens": [
"error",
"always"
Expand Down Expand Up @@ -44,5 +46,13 @@ module.exports = {
]
}
]
}
},
"overrides": [
{
"files": ["*api.test.js", "*cache.test.js", "*subscriber.test.js"],
"rules": {
"no-unused-expressions": "off"
}
}
]
alesPoz marked this conversation as resolved.
Show resolved Hide resolved
};
3 changes: 2 additions & 1 deletion test/_test-data.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { PrivateKey, constants } from "../";
// eslint-disable-next-line import/no-unresolved, import/extensions
import { PrivateKey, constants } from '../';
alesPoz marked this conversation as resolved.
Show resolved Hide resolved

export const privateKey = PrivateKey.fromWif('5KkYp8qdQBaRmLqLz8WVrGjzkt7E13qVcr7cpdLowgJ1mjRyDx2');
export const accountName = 'nathan';
Expand Down
8 changes: 4 additions & 4 deletions test/_test-utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { strictEqual, ok, fail } from "assert";
import { inspect } from "util";
import { strictEqual, ok, fail } from 'assert';
import { inspect } from 'util';

/**
* @param {() => Promise<any> | any} f
Expand All @@ -20,11 +20,11 @@ export function shouldReject(f, expectedErrorMessage, testErrorMessage) {
console.log('got result:', inspect(res, false, null, true));
fail('should rejects');
});
it('instance of Error', function () {
it('instance of Error', () => {
alesPoz marked this conversation as resolved.
Show resolved Hide resolved
if (!actualError) this.skip();
ok(actualError instanceof Error);
});
it(testErrorMessage || `with message "${expectedErrorMessage}"`, function () {
it(testErrorMessage || `with message "${expectedErrorMessage}"`, () => {
if (!actualError || !(actualError instanceof Error)) this.skip();
strictEqual(actualError.message, expectedErrorMessage);
});
Expand Down
108 changes: 58 additions & 50 deletions test/api.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { expect } from 'chai';
import { deepStrictEqual } from 'assert';
import WS from '../src/echo/ws';
import WSAPI from '../src/echo/ws-api';
import Cache from '../src/echo/cache';
Expand All @@ -8,18 +9,17 @@ import echo, { constants } from '../src';
import { DEFAULT_CHAIN_APIS, CHAIN_API } from '../src/constants/ws-constants';

import { url, accountId } from './_test-data';
import { deepStrictEqual } from 'assert';
import { shouldReject } from './_test-utils';

describe('API', () => {
describe('API CONNECTION', () => {
describe('when apis are provided', () => {
const apis = [CHAIN_API.DATABASE_API, CHAIN_API.ASSET_API];
before(async () => await echo.connect(url, { apis }));
after(async () => await echo.disconnect());
before(async () => echo.connect(url, { apis }));
after(async () => echo.disconnect());
it('only provided apis should be connected', () => deepStrictEqual(echo.apis, new Set(apis)));
describe('when provided api used', () => {
it('should succeed', async () => await echo.api.getBlock(1));
it('should succeed', async () => echo.api.getBlock(1));
});
describe('when not provided api used', () => {
const expectedErrorMessage = [
Expand All @@ -33,11 +33,11 @@ describe('API', () => {
});

describe('when apis options is not provided', () => {
before(async () => await echo.connect(url, {}));
after(async () => await echo.disconnect());
before(async () => echo.connect(url, {}));
after(async () => echo.disconnect());
it('only default apis should be connected', () => deepStrictEqual(echo.apis, new Set(DEFAULT_CHAIN_APIS)));
describe('when deafult api used', () => {
it('should succed', async () => await echo.api.getBlock(1));
it('should succed', async () => echo.api.getBlock(1));
});
describe('when not default api used', () => {
const expectedErrorMessage = [
Expand All @@ -63,21 +63,21 @@ describe('API', () => {
await echo.connect(url, { apis });
await echo.reconnect();
});
after(async () => await echo.disconnect());
after(async () => echo.disconnect());
it('only provided apis should be connected', () => deepStrictEqual(echo.apis, new Set(apis)));
describe('when provided api used', () => {
it('should succeed', async () => await echo.api.getAllAssetHolders());
it('should succeed', async () => echo.api.getAllAssetHolders());
});
describe('when provided api used', () => {
it('should succeed', async () => await echo.api.getAccountHistory(accountId));
it('should succeed', async () => echo.api.getAccountHistory(accountId));
});
describe('when not nonprovided api used', () => {
const expectedErrorMessage = [
'database API is not available',
'try to specify this in connection option called "apis"',
].join(', ');
shouldReject(async () => {
await echo.api.getBlock(1)
await echo.api.getBlock(1);
}, expectedErrorMessage, 'with expected message');
});
});
Expand Down Expand Up @@ -168,12 +168,10 @@ describe('API', () => {
beforeEach(async () => {
await ws.connect(url, {
debug: false,
apis: constants.WS_CONSTANTS.CHAIN_APIS
apis: constants.WS_CONSTANTS.CHAIN_APIS,
});
});
afterEach(async () => {
await ws.close();
});
afterEach(async () => ws.close());

describe('configs', () => {
describe('#getChainProperties()', () => {
Expand Down Expand Up @@ -514,11 +512,11 @@ describe('API', () => {
const cache = new Cache();
const api = new API(cache, wsApi);

const accountId = `1.${constants.PROTOCOL_OBJECT_TYPE_ID.ACCOUNT}.2`;
const newAccountId = `1.${constants.PROTOCOL_OBJECT_TYPE_ID.ACCOUNT}.2`;
const assetId = `1.${constants.PROTOCOL_OBJECT_TYPE_ID.ASSET}.0`;
const assetSymbol = 'ECHO';

const objects = await api.getObjects([accountId, assetId]);
const objects = await api.getObjects([newAccountId, assetId]);

const accountName = objects[0].name;

Expand All @@ -530,14 +528,14 @@ describe('API', () => {
expect(objects[0])
.to
.deep
.equal(cache.accountsById.get(accountId)
.equal(cache.accountsById.get(newAccountId)
.toJS());
expect(objects[0])
.to
.deep
.equal(cache.objectsById.get(accountId)
.equal(cache.objectsById.get(newAccountId)
.toJS());
expect(accountId)
expect(newAccountId)
.to
.equal(cache.accountsByName.get(accountName));
expect(objects[1])
Expand Down Expand Up @@ -568,11 +566,11 @@ describe('API', () => {
const cache = new Cache();
const api = new API(cache, wsApi);

const accountId = `1.${constants.PROTOCOL_OBJECT_TYPE_ID.ACCOUNT}.2`;
const newAccountId = `1.${constants.PROTOCOL_OBJECT_TYPE_ID.ACCOUNT}.2`;
const assetId = `1.${constants.PROTOCOL_OBJECT_TYPE_ID.ASSET}.0`;
const assetSymbol = 'ECHO';

const objects = await api.getObjects([accountId, assetId]);
const objects = await api.getObjects([newAccountId, assetId]);

const accountName = objects[0].name;

Expand All @@ -584,14 +582,14 @@ describe('API', () => {
expect(objects[0])
.to
.deep
.equal(cache.accountsById.get(accountId)
.equal(cache.accountsById.get(newAccountId)
.toJS());
expect(objects[0])
.to
.deep
.equal(cache.objectsById.get(accountId)
.equal(cache.objectsById.get(newAccountId)
.toJS());
expect(accountId)
expect(newAccountId)
.to
.equal(cache.accountsByName.get(accountName));
expect(objects[1])
Expand Down Expand Up @@ -783,7 +781,7 @@ describe('API', () => {
.timeout(5000);
});
describe('#requestRegistrationTask', () => {
it('should get registration task', async() => {
it('should get registration task', async () => {
try {
const wsApi = new WSAPI(ws);
const cache = new Cache();
Expand Down Expand Up @@ -817,7 +815,7 @@ describe('API', () => {
.be
.an('array');

const accountId = objects[0].committee_member_account;
const committeeMemberAccountId = objects[0].committee_member_account;
const voteId = objects[0].vote_id;

expect(objects[0])
Expand All @@ -833,7 +831,7 @@ describe('API', () => {
expect(objects[0])
.to
.deep
.equal(cache.committeeMembersByAccountId.get(accountId)
.equal(cache.committeeMembersByAccountId.get(committeeMemberAccountId)
.toJS());
expect(objects[0])
.to
Expand All @@ -853,16 +851,15 @@ describe('API', () => {
const cache = new Cache();
const api = new API(cache, wsApi);

const accountId = `1.${constants.PROTOCOL_OBJECT_TYPE_ID.ACCOUNT}.6`;
const newAccountId = `1.${constants.PROTOCOL_OBJECT_TYPE_ID.ACCOUNT}.6`;

const object = await api.getCommitteeMemberByAccount(accountId);
const object = await api.getCommitteeMemberByAccount(newAccountId);

expect(object)
.to
.be
.an('object');

const id = object.id;
const { id } = object;
const voteId = object.vote_id;

expect(object)
Expand All @@ -878,7 +875,7 @@ describe('API', () => {
expect(object)
.to
.deep
.equal(cache.committeeMembersByAccountId.get(accountId)
.equal(cache.committeeMembersByAccountId.get(newAccountId)
.toJS());
expect(object)
.to
Expand All @@ -891,7 +888,7 @@ describe('API', () => {
})
.timeout(5000);
});
describe('#getCommitteeFrozenBalance()', () =>{
describe('#getCommitteeFrozenBalance()', () => {
it('should get committee frozen balance by committee member id', async () => {
try {
const wsApi = new WSAPI(ws);
Expand All @@ -907,9 +904,10 @@ describe('API', () => {
.be
.an('object');

const { asset_id, amount } = object;
const { amount } = object;
const assetId = object.asset_id;
alesPoz marked this conversation as resolved.
Show resolved Hide resolved

expect(asset_id)
expect(assetId)
.to
.be
.an('string').that.is.not.empty;
Expand All @@ -930,25 +928,28 @@ describe('API', () => {
const cache = new Cache();
const api = new API(cache, wsApi);

const accountId = `1.${constants.PROTOCOL_OBJECT_TYPE_ID.ACCOUNT}.6`;
const newAccountId = `1.${constants.PROTOCOL_OBJECT_TYPE_ID.ACCOUNT}.6`;

const btcAddress = await api.getBtcAddress(accountId);
const btcAddress = await api.getBtcAddress(newAccountId);

expect(btcAddress)
.to
.be
.an('null');;
.an('null');
} catch (e) {
throw e;
}
})
.timeout(5000);
});

/*eslint-disable */
// TODO:: return 76a9148768abc89249471f990fdf33029ac6c733603a258763ac6775532102c16e97132e72738c9c0163656348cd1be03521de17efeb07e496e74
// 2ac84512e2102c16e97132e72738c9c0163656348cd1be03521de17efeb07e496e742ac84512e2102c16e97132e72738c9c0163656348cd1be03521de17efeb07e4
// 96e742ac84512e2102c16e97132e72738c9c0163656348cd1be03521de17efeb07e496e742ac84512e2102c16e97132e72738c9c0163656348cd1be03521de17efe
// b07e496e742ac84512e21026b86b273ff34fce19d6b804eff5a3f5747ada4eaa22f1d49c01e52ddb7875b4b56ae68
/* eslint-enable */
alesPoz marked this conversation as resolved.
Show resolved Hide resolved

describe.skip('#getBtcDepositScript()', () => {
it('should get null because script with this deposit id does not exist', async () => {
try {
Expand All @@ -963,7 +964,7 @@ describe('API', () => {
expect(script)
.to
.be
.an('null');;
.an('null');
} catch (e) {
throw e;
}
Expand All @@ -975,21 +976,22 @@ describe('API', () => {
describe('history', () => {
const ws = new WS();
beforeEach(async () => {
await ws.connect(url, { apis: ['database', 'network_broadcast', 'history', 'registration', 'asset', 'login'] });
});
afterEach(async () => {
await ws.close();
await ws.connect(
url,
{ apis: ['database', 'network_broadcast', 'history', 'registration', 'asset', 'login'] },
);
});
afterEach(async () => ws.close());
describe('#getAccountHistory()', () => {
it('should get account history', async () => {
try {
const wsApi = new WSAPI(ws);
const cache = new Cache();
const api = new API(cache, wsApi);

const accountId = `1.${constants.PROTOCOL_OBJECT_TYPE_ID.ACCOUNT}.2`;
const newAccountId = `1.${constants.PROTOCOL_OBJECT_TYPE_ID.ACCOUNT}.2`;

const history = await api.getAccountHistory(accountId);
const history = await api.getAccountHistory(newAccountId);
expect(history)
.to
.be
Expand All @@ -1007,12 +1009,12 @@ describe('API', () => {
const cache = new Cache();
const api = new API(cache, wsApi);

const accountId = `1.${constants.PROTOCOL_OBJECT_TYPE_ID.ACCOUNT}.0`;
const newAccountId = `1.${constants.PROTOCOL_OBJECT_TYPE_ID.ACCOUNT}.0`;
const start = 0;
const stop = 0;
const limit = 10;

const history = await api.getRelativeAccountHistory(accountId, stop, limit, start);
const history = await api.getRelativeAccountHistory(newAccountId, stop, limit, start);
expect(history)
.to
.be
Expand All @@ -1030,13 +1032,19 @@ describe('API', () => {
const cache = new Cache();
const api = new API(cache, wsApi);

const accountId = `1.${constants.PROTOCOL_OBJECT_TYPE_ID.ACCOUNT}.0`;
const newAccountId = `1.${constants.PROTOCOL_OBJECT_TYPE_ID.ACCOUNT}.0`;
const operationId = 0;
const start = `1.${constants.PROTOCOL_OBJECT_TYPE_ID.OPERATION_HISTORY}.0`;
const stop = `1.${constants.PROTOCOL_OBJECT_TYPE_ID.OPERATION_HISTORY}.0`;
const limit = 10;

const history = await api.getAccountHistoryOperations(accountId, operationId, start, stop, limit);
const history = await api.getAccountHistoryOperations(
newAccountId,
operationId,
start,
stop,
limit,
);
expect(history)
.to
.be
Expand Down
Loading