Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit0f8c72d

Browse files
committed
show fail message in ui
Signed-off-by: shmck <shawn.j.mckay@gmail.com>
1 parentd7f6949 commit0f8c72d

File tree

9 files changed

+22
-14
lines changed

9 files changed

+22
-14
lines changed

‎src/editor/commands.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import * as TT from 'typings/tutorial'
33
import*asvscodefrom'vscode'
44
importcreateTestRunnerfrom'../services/testRunner'
55
import{setupActions}from'../actions/setupActions'
6-
importcreateWebViewfrom'../webview'
6+
importcreateWebViewfrom'../services/webview'
77
importloggerfrom'../services/logger'
88

99
exportconstCOMMANDS={
@@ -62,9 +62,9 @@ export const createCommands = ({ extensionPath, workspaceState }: CreateCommandP
6262
// send test pass message back to client
6363
webview.send({type:'TEST_PASS',payload:{ position}})
6464
},
65-
onFail:(position:T.Position,message:string)=>{
65+
onFail:(position:T.Position,failSummary:T.TestFail):void=>{
6666
// send test fail message back to client with failure message
67-
webview.send({type:'TEST_FAIL',payload:{ position,message}})
67+
webview.send({type:'TEST_FAIL',payload:{ position,fail:failSummary}})
6868
},
6969
onError:(position:T.Position)=>{
7070
// TODO: send test error message back to client

‎src/services/testRunner/formatOutput.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { ParserOutput, Fail } from './parser'
44
// export const formatSuccessOutput = (tap: ParserOutput): string => {}
55

66
exportconstformatFailOutput=(tap:ParserOutput):string=>{
7-
letoutput=`FAILEDTESTS\n`
7+
letoutput=`FAILEDTEST LOG\n`
88
tap.failed.forEach((fail:Fail)=>{
99
constdetails=fail.details ?`\n${fail.details}\n` :''
1010
constlogs=fail.logs ?`\n${fail.logs.join('\n')}\n` :''

‎src/services/testRunner/index.ts‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { formatFailOutput } from './formatOutput'
1010

1111
interfaceCallbacks{
1212
onSuccess(position:T.Position):void
13-
onFail(position:T.Position,message:string):void
13+
onFail(position:T.Position,failSummary:T.TestFail):void
1414
onRun(position:T.Position):void
1515
onError(position:T.Position):void
1616
}
@@ -56,8 +56,12 @@ const createTestRunner = (config: TT.TutorialTestRunnerConfig, callbacks: Callba
5656
if(stderr){
5757
// FAIL also trigger stderr
5858
if(stdout&&stdout.length&&!tap.ok){
59-
constfirstFailMessage=tap.failed[0].message
60-
callbacks.onFail(position,firstFailMessage)
59+
constfirstFail=tap.failed[0]
60+
constfailSummary={
61+
title:firstFail.message||'Test Failed',
62+
description:firstFail.details||'Unknown error',
63+
}
64+
callbacks.onFail(position,failSummary)
6165
constoutput=formatFailOutput(tap)
6266
displayOutput({channel:failChannelName,text:output,show:true})
6367
return

‎src/services/testRunner/output.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,11 @@ interface DisplayOutput {
1818
exportconstdisplayOutput=(params:DisplayOutput)=>{
1919
constchannel=getOutputChannel(params.channel)
2020
channel.clear()
21-
channel.show(params.show||false)
2221
channel.append(params.text)
2322
}
2423

2524
exportconstclearOutput=(channelName:string)=>{
2625
constchannel=getOutputChannel(channelName)
27-
channel.show(false)
2826
channel.clear()
2927
channel.hide()
3028
}

‎src/webview/index.ts‎renamed to ‎src/services/webview/index.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import*aspathfrom'path'
22
import{Action}from'typings'
33
import*asvscodefrom'vscode'
4-
importChannelfrom'../channel'
4+
importChannelfrom'../../channel'
55
importrenderfrom'./render'
66

77
interfaceReactWebViewProps{

‎src/webview/render.ts‎renamed to ‎src/services/webview/render.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import{JSDOM}from'jsdom'
22
import*aspathfrom'path'
33
import*asvscodefrom'vscode'
4-
importonErrorfrom'../services/sentry/onError'
4+
importonErrorfrom'../sentry/onError'
55

66
constgetNonce=():string=>{
77
lettext=''

‎typings/index.d.ts‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ export interface TestStatus {
4242
type:'success'|'warning'|'error'|'loading'
4343
title:string
4444
content?:string
45+
timeout?:number
4546
}
4647

4748
exportinterfaceMachineContext{
@@ -116,3 +117,8 @@ export interface ProcessEvent {
116117
description:string
117118
status:'RUNNING'|'SUCCESS'|'FAIL'|'ERROR'
118119
}
120+
121+
exporttypeTestFail={
122+
title:string
123+
description:string
124+
}

‎web-app/src/components/ProcessMessages/TestMessage.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { css, jsx } from '@emotion/core'
55

66
constdurations={
77
success:1000,
8-
warning:4500,
8+
warning:20000,
99
error:4500,
1010
loading:300000,
1111
}

‎web-app/src/services/state/actions/testNotify.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ const testActions: ActionFunctionMap<CR.MachineContext, CR.MachineEvent> = {
2020
testFail:assign({
2121
testStatus:(context,event)=>({
2222
type:'warning',
23-
title:'Fail!',
24-
content:event.payload.message,
23+
title:event.payload.fail.title,
24+
content:event.payload.fail.description,
2525
}),
2626
}),
2727
//@ts-ignore

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp