pull/5370/head
filip mertens 2 years ago
parent cfb1176bf1
commit 78c730e072
  1. 2
      apps/remix-ide-e2e/src/tests/url.test.ts
  2. 10
      apps/remix-ide/src/app.js
  3. 4
      libs/remix-ui/editor/src/lib/remix-ui-editor.tsx
  4. 4
      libs/remix-ui/editor/src/lib/web-types.ts

@ -160,7 +160,6 @@ module.exports = {
browser browser
.url('http://127.0.0.1:8080/#optimize=false&runs=200&deployProxy=true') .url('http://127.0.0.1:8080/#optimize=false&runs=200&deployProxy=true')
.refresh().pause(10000) .refresh().pause(10000)
.switchWorkspace('default_workspace') .switchWorkspace('default_workspace')
.addFile('myTokenV1.sol', sources[1]['myTokenV1.sol']) .addFile('myTokenV1.sol', sources[1]['myTokenV1.sol'])
.clickLaunchIcon('solidity') .clickLaunchIcon('solidity')
@ -178,7 +177,6 @@ module.exports = {
browser browser
.url('http://127.0.0.1:8080/#optimize=false&runs=200&upgradeProxy=true') .url('http://127.0.0.1:8080/#optimize=false&runs=200&upgradeProxy=true')
.refresh().pause(10000) .refresh().pause(10000)
.pause(10000)
.waitForElementVisible('*[data-id="treeViewLitreeViewItemmyTokenV1.sol"]', 60000) .waitForElementVisible('*[data-id="treeViewLitreeViewItemmyTokenV1.sol"]', 60000)
.openFile('myTokenV1.sol') .openFile('myTokenV1.sol')
.waitForElementVisible({ .waitForElementVisible({

@ -381,7 +381,10 @@ class AppComponent {
'filePanel', 'filePanel',
'workspaceInitializationCompleted', 'workspaceInitializationCompleted',
async () => { async () => {
console.log('workspaceInitializationCompleted') // for e2e tests
const workspaceloaded = document.createElement('span')
workspaceloaded.setAttribute('data-id', 'workspaceloaded')
document.body.appendChild(workspaceloaded)
await this.appManager.registerContextMenuItems() await this.appManager.registerContextMenuItems()
} }
) )
@ -447,8 +450,9 @@ class AppComponent {
} }
} }
console.log('app is done') const workspaceloaded = document.createElement('span')
workspaceloaded.setAttribute('data-id', 'apploaded')
document.body.appendChild(workspaceloaded)
}) })
.catch(console.error) .catch(console.error)
} }

@ -606,7 +606,9 @@ export const EditorUI = (props: EditorUIProps) => {
} }
return result return result
} }
console.log('editor mounted') const workspaceloaded = document.createElement('span')
workspaceloaded.setAttribute('data-id', 'editorloaded')
document.body.appendChild(workspaceloaded)
} }
function handleEditorWillMount(monaco) { function handleEditorWillMount(monaco) {

@ -233,5 +233,7 @@ export const loadTypes = async (monaco) => {
const mochaType = await import('raw-loader!@types/mocha/index.d.ts') const mochaType = await import('raw-loader!@types/mocha/index.d.ts')
monaco.languages.typescript.typescriptDefaults.addExtraLib(mochaType.default, `file:///node_modules/@types/mocha/index.d.ts`) monaco.languages.typescript.typescriptDefaults.addExtraLib(mochaType.default, `file:///node_modules/@types/mocha/index.d.ts`)
console.log('types loaded') const workspaceloaded = document.createElement('span')
workspaceloaded.setAttribute('data-id', 'typesloaded')
document.body.appendChild(workspaceloaded)
} }
Loading…
Cancel
Save