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

delete extra check output , <></> #743

Merged
merged 1 commit into from May 5, 2020
Merged

delete extra check output , <></> #743

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
29 changes: 12 additions & 17 deletions services/app/assets/js/widgets/components/ExecutionOutput/AccordeonBox.jsx
View file
Open in desktop
Expand Up @@ -110,30 +110,25 @@ const SubMenu = ({
</div>
</div>
) : null}

</div>
);
};


const Item = ({ output, result }) => (
<>
{output ? (
<div className="alert alert-secondary mb-0">
{result ? (
<pre className="border-bottom border-dark card-text pb-3">
<span className="font-weight-bold d-block">Result:</span>
{result}
</pre>
) : null}

<pre className="card-text">
<span className="font-weight-bold d-block">Output:</span>
{output}
</pre>
</div>
<div className="alert alert-secondary mb-0">
{result ? (
<pre className="border-bottom border-dark card-text pb-3">
<span className="font-weight-bold d-block">Result:</span>
{result}
</pre>
) : null}
</>

<pre className="card-text">
<span className="font-weight-bold d-block">Output:</span>
{output}
</pre>
</div>
);


Expand Down
64 changes: 31 additions & 33 deletions services/app/assets/js/widgets/components/ExecutionOutput/ExecutionOutput.jsx
View file
Open in desktop
Expand Up @@ -36,40 +36,38 @@ const ExecutionOutput = ({
const assertsData = asserts.map(JSON.parse);
const percent = (100 * successCount) / assertsCount;
return (
<>
<AccordeonBox>
<AccordeonBox.Menu
count={i18n.t(
'You passed %{successCount} from %{assertsCount} asserts. (%{percent}%)',
{ successCount, assertsCount, percent },
)}
statusColor={statusColor[resultData.status]}
message={getMessage(resultData.status)}
>
{resultData.status === 'error' ? (
<AccordeonBox.Item
statusColor={statusColor[resultData.status]}
output={output}
result={resultData.result}
/>
) : (
assertsData.map((assert, index) => (
<AccordeonBox.SubMenu
key={index.toString()}
<AccordeonBox>
<AccordeonBox.Menu
count={i18n.t(
'You passed %{successCount} from %{assertsCount} asserts. (%{percent}%)',
{ successCount, assertsCount, percent },
)}
statusColor={statusColor[resultData.status]}
message={getMessage(resultData.status)}
>
{resultData.status === 'error' ? (
<AccordeonBox.Item
statusColor={statusColor[resultData.status]}
output={output}
result={resultData.result}
/>
) : (
assertsData.map((assert, index) => (
<AccordeonBox.SubMenu
key={index.toString()}
statusColor={statusColor[assert.status]}
assert={assert}
hasOutput={assert.output}
>
<AccordeonBox.Item
statusColor={statusColor[assert.status]}
assert={assert}
hasOutput={assert.output}
>
<AccordeonBox.Item
statusColor={statusColor[assert.status]}
output={assert.output}
/>
</AccordeonBox.SubMenu>
))
)}
</AccordeonBox.Menu>
</AccordeonBox>
</>
output={assert.output}
/>
</AccordeonBox.SubMenu>
))
)}
</AccordeonBox.Menu>
</AccordeonBox>
);
};

Expand Down