extern/bruno
1
0
Fork 1
mirror of https://github.com/usebruno/bruno.git synced 2025-06-21 12:33:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat: bruno cli can sort the requests being run

Browse Source
This commit is contained in:
Anoop M D 2023-02-08 01:43:16 +05:30
parent d0f2eb27bc
commit 03fa46d8b3
2 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
packages/bruno-cli/src/commands/run.js
View File

@ -5,6 +5,7 @@ const { exists, isFile, isDirectory } = require('../utils/filesystem');
const { runSingleRequest } = require('../runner/run-single-request'); const { runSingleRequest } = require('../runner/run-single-request');
const { bruToEnvJson, getEnvVars } = require('../utils/bru'); const { bruToEnvJson, getEnvVars } = require('../utils/bru');
const { rpad } = require('../utils/common'); const { rpad } = require('../utils/common');
const { bruToJson } = require('../utils/bru');
const command = 'run <filename>'; const command = 'run <filename>';
const desc = 'Run a request'; const desc = 'Run a request';
@ -83,10 +84,12 @@ const handler = async function (argv) {
const _isFile = await isFile(filename); const _isFile = await isFile(filename);
if(_isFile) { if(_isFile) {
console.log(chalk.yellow('Running Request \n')); console.log(chalk.yellow('Running Request \n'));
const bruContent = fs.readFileSync(filename, 'utf8');
const bruJson = bruToJson(bruContent);
const { const {
assertionResults, assertionResults,
testResults testResults
} = await runSingleRequest(filename, collectionPath, collectionVariables, envVars); } = await runSingleRequest(filename, bruJson, collectionPath, collectionVariables, envVars);
printRunSummary(assertionResults, testResults); printRunSummary(assertionResults, testResults);
console.log(chalk.dim(chalk.grey('Done.'))); console.log(chalk.dim(chalk.grey('Done.')));
@ -98,15 +101,36 @@ const handler = async function (argv) {
const files = fs.readdirSync(filename); const files = fs.readdirSync(filename);
const bruFiles = files.filter((file) => file.endsWith('.bru')); const bruFiles = files.filter((file) => file.endsWith('.bru'));
const bruJsons = [];
for (const bruFile of bruFiles) {
const bruFilepath = path.join(filename, bruFile)
const bruContent = fs.readFileSync(bruFilepath, 'utf8');
const bruJson = bruToJson(bruContent);
bruJsons.push({
bruFilepath,
bruJson
});
}
// order requests by sequence
bruJsons.sort((a, b) => {
const aSequence = a.bruJson.seq || 0;
const bSequence = b.bruJson.seq || 0;
return aSequence - bSequence;
});
let assertionResults = []; let assertionResults = [];
let testResults = []; let testResults = [];
for (const bruFile of bruFiles) { for (const iter of bruJsons) {
const {
bruFilepath,
bruJson
} = iter;
const { const {
assertionResults: _assertionResults, assertionResults: _assertionResults,
testResults: _testResults testResults: _testResults
} = await runSingleRequest(path.join(filename, bruFile), collectionPath, collectionVariables, envVars); } = await runSingleRequest(bruFilepath, bruJson, collectionPath, collectionVariables, envVars);
assertionResults = assertionResults.concat(_assertionResults); assertionResults = assertionResults.concat(_assertionResults);
testResults = testResults.concat(_testResults); testResults = testResults.concat(_testResults);

7
packages/bruno-cli/src/runner/run-single-request.js
View File

@ -1,4 +1,3 @@
const fs = require('fs');
const chalk = require('chalk'); const chalk = require('chalk');
const { forOwn, each, extend, get } = require('lodash'); const { forOwn, each, extend, get } = require('lodash');
const FormData = require('form-data'); const FormData = require('form-data');
@ -6,14 +5,10 @@ const axios = require('axios');
const prepareRequest = require('./prepare-request'); const prepareRequest = require('./prepare-request');
const interpolateVars = require('./interpolate-vars'); const interpolateVars = require('./interpolate-vars');
const { ScriptRuntime, TestRuntime, VarsRuntime, AssertRuntime } = require('@usebruno/js'); const { ScriptRuntime, TestRuntime, VarsRuntime, AssertRuntime } = require('@usebruno/js');
const { bruToJson } = require('../utils/bru');
const { stripExtension } = require('../utils/filesystem'); const { stripExtension } = require('../utils/filesystem');
const runSingleRequest = async function (filename, collectionPath, collectionVariables, envVariables) { const runSingleRequest = async function (filename, bruJson, collectionPath, collectionVariables, envVariables) {
try { try {
const bruContent = fs.readFileSync(filename, 'utf8');
const bruJson = bruToJson(bruContent);
const request = prepareRequest(bruJson.request); const request = prepareRequest(bruJson.request);
// make axios work in node using form data // make axios work in node using form data