Skip to content

Commit 91dea93

Browse files
committed
i think we are ready to go
1 parent c12e9d2 commit 91dea93

File tree

6 files changed

+57
-34
lines changed

6 files changed

+57
-34
lines changed

packages/selenium-ide/scripts/ide-runner.js

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -75,19 +75,28 @@ async function main() {
7575
} catch (e) {}
7676
}
7777
await driver.switchTo().window(handles[0])
78+
79+
const projectTab = await driver.wait(
80+
webdriver.until.elementLocated(webdriver.By.id('tab-2')),
81+
5000
82+
)
83+
await projectTab.click()
84+
7885
const url = await driver.wait(
79-
webdriver.until.elementLocated(webdriver.By.css('[data-url]')),
86+
webdriver.until.elementLocated(webdriver.By.id('project-url')),
8087
5000
8188
)
82-
await url.click()
8389
while ((await url.getAttribute('value')) !== '') {
8490
await url.sendKeys(webdriver.Key.BACK_SPACE)
8591
}
86-
const host = 'http://localhost:8080'
87-
for (const index in host) {
88-
await url.sendKeys(host[index])
89-
await driver.sleep(10)
90-
}
92+
await url.sendKeys('http://localhost:8080')
93+
94+
const testTab = await driver.wait(
95+
webdriver.until.elementLocated(webdriver.By.id('tab-0')),
96+
5000
97+
)
98+
await testTab.click()
99+
91100
const record = await driver.wait(
92101
webdriver.until.elementLocated(webdriver.By.css('[data-record]')),
93102
1000

packages/selenium-ide/src/browser/windows/ProjectEditor/renderer.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ import SIDELogger from 'browser/components/Logger'
66
import PlaybackControls from 'browser/components/PlaybackControls'
77
import ProjectPlaybackWindow from 'browser/components/PlaybackPanel'
88
import ProjectEditor from 'browser/components/ProjectEditor'
9-
import { TAB, TESTS_TAB } from 'browser/enums/tab'
9+
import { PROJECT_TAB, TAB } from 'browser/enums/tab'
1010
import { usePanelGroup } from 'browser/hooks/usePanelGroup'
1111
import { SessionContextProviders } from 'browser/contexts/provider'
1212

1313
const ProjectMainWindow = () => {
14-
const [tab, setTab] = React.useState<TAB>(TESTS_TAB)
14+
const [tab, setTab] = React.useState<TAB>(PROJECT_TAB)
1515
return (
1616
<AppWrapper>
1717
<SessionContextProviders>

packages/selenium-ide/src/browser/windows/ProjectEditor/tabs/Project/ProjectSettings.tsx

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,11 @@ const {
2020
} = window.sideAPI
2121
const ProjectSettings: FC = () => {
2222
const {
23-
project: { delay, name, plugins },
23+
project: { delay, name, plugins, url },
2424
} = React.useContext(context)
25+
if (url === 'http://loading') {
26+
return null
27+
}
2528
return (
2629
<>
2730
<Stack className="p-4" spacing={1}>
@@ -39,6 +42,20 @@ const ProjectSettings: FC = () => {
3942
value={name}
4043
/>
4144
</FormControl>
45+
<FormControl>
46+
<TextField
47+
id="project-url"
48+
label="Project URL"
49+
name="project-url"
50+
onChange={(e: any) => {
51+
update({
52+
url: e.target.value,
53+
})
54+
}}
55+
size="small"
56+
value={url}
57+
/>
58+
</FormControl>
4259
<FormControl>
4360
<TextField
4461
id="delay"

packages/selenium-ide/src/main/session/controllers/ResizablePanels/index.ts

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -43,19 +43,19 @@ export default class ResizablePanelsController extends BaseController {
4343
const panelScreenPosition = await this.getPanelScreenPosition(
4444
'playback-panel'
4545
)
46-
const offset = { x: 0, y: 0 };
46+
const offset = { x: 0, y: 0 }
4747
switch (process.platform) {
4848
case 'win32':
49-
offset.x = 12;
50-
offset.y = 21;
51-
break;
49+
offset.x = 12
50+
offset.y = 21
51+
break
5252
case 'darwin':
53-
offset.x = 0;
54-
offset.y = -29;
55-
break;
53+
offset.x = 0
54+
offset.y = -29
55+
break
5656
default:
57-
offset.x = 0;
58-
offset.y = 0;
57+
offset.x = 0
58+
offset.y = 0
5959
}
6060
this.cachedPlaybackWindowDimensions = {
6161
position: [
@@ -67,12 +67,17 @@ export default class ResizablePanelsController extends BaseController {
6767
position: [number, number]
6868
size: [number, number]
6969
}
70-
return this.cachedPlaybackWindowDimensions!;
70+
return this.cachedPlaybackWindowDimensions!
7171
}
7272

7373
async recalculatePlaybackWindows() {
74-
this.session.windows.recalculatePlaybackWindows()
74+
const { active, height, width } =
75+
this.session.state.state.editor.overrideWindowSize
76+
if (active) {
77+
return this.session.windows.resizePlaybackWindows(width, height)
78+
}
7579
const panelDims = await this.getPlaybackWindowDimensions()
80+
this.session.windows.resizePlaybackWindows(...panelDims.size)
7681
this.session.windows.playbackWindows.forEach((playbackWindow) => {
7782
playbackWindow.setPosition(...panelDims.position)
7883
})

packages/selenium-ide/src/main/session/controllers/State/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export default class StateController extends BaseController {
3232
set(key: string, _data: any) {
3333
if (key.includes('editor.overrideWindowSize')) {
3434
queue(async () => {
35-
await this.session.windows.recalculatePlaybackWindows()
35+
await this.session.resizablePanels.recalculatePlaybackWindows()
3636
})
3737
}
3838
}

packages/selenium-ide/src/main/session/controllers/Windows/index.ts

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -352,6 +352,7 @@ export default class WindowsController extends BaseController {
352352
)
353353
const window = this.windowLoaders[playbackWindowName]({
354354
...opts,
355+
show: false,
355356
x: playbackPanel.position[0],
356357
y: playbackPanel.position[1],
357358
width: correctedDims.width,
@@ -414,7 +415,9 @@ export default class WindowsController extends BaseController {
414415
}
415416

416417
async requestPlaybackWindow() {
417-
await this.openPlaybackWindow(null)
418+
const window = await this.openPlaybackWindow(null)
419+
const projectURL = this.session.projects.project.url
420+
window.loadURL(projectURL)
418421
}
419422

420423
async calculateScaleAndZoom(_targetWidth: number, _targetHeight: number) {
@@ -462,17 +465,6 @@ export default class WindowsController extends BaseController {
462465
window.webContents.setZoomFactor(zoomFactor)
463466
}
464467

465-
async recalculatePlaybackWindows() {
466-
const { active, height, width } =
467-
this.session.state.state.editor.overrideWindowSize
468-
if (active) {
469-
return this.resizePlaybackWindows(width, height)
470-
}
471-
const panelDims =
472-
await this.session.resizablePanels.getPlaybackWindowDimensions()
473-
this.resizePlaybackWindows(...panelDims.size)
474-
}
475-
476468
async resizePlaybackWindows(_targetWidth: number, _targetHeight: number) {
477469
const { width, height, zoomFactor } = await this.calculateScaleAndZoom(
478470
_targetWidth,

0 commit comments

Comments
 (0)