Commite4d23ff

authored

fix(site): add test and fix username params in terminal (#8052)

1 parentf61001d commite4d23ffCopy full SHA for e4d23ff

File tree

+18

-1

lines changed

+18

-1

lines changed

Lines changed: 15 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ import {`
`15`	`15`	`}from"../../testHelpers/renderHelpers"`
`16`	`16`	`import{server}from"../../testHelpers/server"`
`17`	`17`	`importTerminalPage,{Language}from"./TerminalPage"`
	`18`	`+import*asAPIfrom"api/api"`
`18`	`19`
`19`	`20`	`Object.defineProperty(window,"matchMedia",{`
`20`	`21`	`writable:true,`
`@@ -63,6 +64,20 @@ const expectTerminalText = (container: HTMLElement, text: string) => {`
`63`	`64`	`}`
`64`	`65`
`65`	`66`	`describe("TerminalPage",()=>{`
	`67`	`+it("loads the right workspace data",async()=>{`
	`68`	`+constspy=jest`
	`69`	`+.spyOn(API,"getWorkspaceByOwnerAndName")`
	`70`	`+.mockResolvedValue(MockWorkspace)`
	`71`	+awaitrenderTerminal(`/${MockUser.username}/${MockWorkspace.name}/terminal`)
	`72`	`+awaitwaitFor(()=>{`
	`73`	`+expect(API.getWorkspaceByOwnerAndName).toHaveBeenCalledWith(`
	`74`	`+MockUser.username,`
	`75`	`+MockWorkspace.name,`
	`76`	`+)`
	`77`	`+})`
	`78`	`+spy.mockRestore()`
	`79`	`+})`
	`80`	`+`
`66`	`81`	`it("shows an error if fetching workspace fails",async()=>{`
`67`	`82`	`// Given`
`68`	`83`	`server.use(`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,9 @@ const TerminalPage: FC = () => {`
`73`	`73`	`constnavigate=useNavigate()`
`74`	`74`	`conststyles=useStyles()`
`75`	`75`	`const{ proxy}=useProxy()`
`76`		`-const{ username,workspace:workspaceName}=useParams()`
	`76`	`+constparams=useParams()as{username:string;workspace:string}`
	`77`	`+constusername=params.username.replace("@","")`
	`78`	`+constworkspaceName=params.workspace`
`77`	`79`	`constxtermRef=useRef<HTMLDivElement>(null)`
`78`	`80`	`const[terminal,setTerminal]=useState<XTerm.Terminal\|null>(null)`
`79`	`81`	`const[fitAddon,setFitAddon]=useState<FitAddon\|null>(null)`

Comments

(0)