Skip to content
This repository has been archived by the owner on Jun 11, 2024. It is now read-only.

Commit

Permalink
Merge pull request #839 from LiskHQ/830-functional_test_type_2
Browse files Browse the repository at this point in the history
Functional tx test type 2 - Closes #830
  • Loading branch information
Isabella Dell authored Oct 14, 2017
2 parents 0930e25 + 60cb44e commit 5c8709d
Show file tree
Hide file tree
Showing 10 changed files with 1,141 additions and 838 deletions.
11 changes: 10 additions & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -294,11 +294,20 @@ lock(resource: "Lisk-Core-Nodes", inversePrecedence: true) {
run_test('test/functional/http/post/0.transfer.js')
}
},
"Functional POST tx type 2" : {
node('node-01'){
sh """
export TEST=test/functional/http/post/2.delegate.js TEST_TYPE='FUNC' NODE_ENV='TEST'
cd "\$(echo ${env.WORKSPACE} | cut -f 1 -d '@')"
npm run ${params.JENKINS_PROFILE}
"""
}
}, // End node-01 functional tests
"Functional Peers" : {
node('node-02'){
run_test('test/functional/http/get/peers.js')
}
}, // End node-01 functional tests
},
"Functional Transport - Main" : {
node('node-02'){
run_test('test/functional/ws/transport.js')
Expand Down
90 changes: 87 additions & 3 deletions test/common/apiHelpers.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,15 @@ var lisk = require('lisk-js');
var node = require('../node');
var http = require('./httpCommunication');

function paramsHelper (url, params) {
if (typeof params != 'undefined' && params != null && Array.isArray(params) && params.length > 0) {
// It is an defined array with at least one element
var queryString = params.join('&');
url += '?' + queryString;
}
return url;
}

function httpCallbackHelper (cb, err, res) {
if (err) {
return cb(err);
Expand All @@ -17,7 +26,10 @@ function getTransaction (transaction, cb) {
}

function getTransactions (params, cb) {
http.get('/api/transactions?' + params.join('&'), httpCallbackHelper.bind(null, cb));
var url = '/api/transactions';
url = paramsHelper(url, params);

http.get(url, httpCallbackHelper.bind(null, cb));
}

function getUnconfirmedTransaction (transaction, cb) {
Expand Down Expand Up @@ -66,8 +78,59 @@ function creditAccount (address, amount, cb) {
sendTransaction(transaction, cb);
}

function getCount (cb) {
http.get('/api/transactions/count', httpCallbackHelper.bind(null, cb));
function getCount (param, cb) {
http.get('/api/' + param + '/count', httpCallbackHelper.bind(null, cb));
}

function registerDelegate (account, cb) {
var transaction = node.lisk.delegate.createDelegate(account.password, account.username);
sendTransaction(transaction, cb);
}

function getForgingStatus (params, cb) {
var url = '/api/delegates/forging/status';
url = paramsHelper(url, params);

http.get(url, httpCallbackHelper.bind(null, cb));
}

function getDelegates (params, cb) {
var url = '/api/delegates';
url = paramsHelper(url, params);

http.get(url, httpCallbackHelper.bind(null, cb));
}

function getVoters (params, cb) {
var url = '/api/delegates/voters';
url = paramsHelper(url, params);

http.get(url, httpCallbackHelper.bind(null, cb));
}

function searchDelegates (params, cb) {
var url = '/api/delegates/search';
url = paramsHelper(url, params);

http.get(url, httpCallbackHelper.bind(null, cb));
}

function putForgingDelegate (params, cb) {
http.put('/api/delegates/forging', params, httpCallbackHelper.bind(null, cb));
}

function getForgedByAccount (params, cb) {
var url = '/api/delegates/forging/getForgedByAccount';
url = paramsHelper(url, params);

http.get(url, httpCallbackHelper.bind(null, cb));
}

function getNextForgers (params, cb) {
var url = '/api/delegates/getNextForgers';
url = paramsHelper(url, params);

http.get(url, httpCallbackHelper.bind(null, cb));
}

function getAccounts (params, cb) {
Expand All @@ -77,6 +140,7 @@ function getAccounts (params, cb) {
function getPublicKey (address, cb) {
http.get('/api/accounts/getPublicKey?address=' + address, httpCallbackHelper.bind(null, cb));
}

function getBalance (address, cb) {
http.get('/api/accounts/getBalance?address=' + address, httpCallbackHelper.bind(null, cb));
}
Expand All @@ -94,6 +158,14 @@ var getPendingMultisignaturePromise = node.Promise.promisify(getPendingMultisign
var creditAccountPromise = node.Promise.promisify(creditAccount);
var sendSignaturePromise = node.Promise.promisify(sendSignature);
var getCountPromise = node.Promise.promisify(getCount);
var registerDelegatePromise = node.Promise.promisify(registerDelegate);
var getForgingStatusPromise = node.Promise.promisify(getForgingStatus);
var getDelegatesPromise = node.Promise.promisify(getDelegates);
var getVotersPromise = node.Promise.promisify(getVoters);
var searchDelegatesPromise = node.Promise.promisify(searchDelegates);
var putForgingDelegatePromise = node.Promise.promisify(putForgingDelegate);
var getForgedByAccountPromise = node.Promise.promisify(getForgedByAccount);
var getNextForgersPromise = node.Promise.promisify(getNextForgers);
var getAccountsPromise = node.Promise.promisify(getAccounts);
var getPublicKeyPromise = node.Promise.promisify(getPublicKey);
var getBalancePromise = node.Promise.promisify(getBalance);
Expand Down Expand Up @@ -126,6 +198,18 @@ module.exports = {
creditAccountPromise: creditAccountPromise,
getCount: getCount,
getCountPromise: getCountPromise,
registerDelegate: registerDelegate,
registerDelegatePromise: registerDelegatePromise,
getForgingStatus: getForgingStatus,
getForgingStatusPromise: getForgingStatusPromise,
getDelegates: getDelegates,
getDelegatesPromise: getDelegatesPromise,
getVoters: getVoters,
getVotersPromise: getVotersPromise,
searchDelegatesPromise: searchDelegatesPromise,
putForgingDelegatePromise: putForgingDelegatePromise,
getForgedByAccountPromise: getForgedByAccountPromise,
getNextForgersPromise: getNextForgersPromise,
getAccounts: getAccounts,
getAccountsPromise: getAccountsPromise,
getPublicKey: getPublicKey,
Expand Down
Loading

0 comments on commit 5c8709d

Please sign in to comment.