Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
B
baas-ide
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
guxukai
baas-ide
Commits
03361824
Commit
03361824
authored
Jun 17, 2021
by
yann300
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix switch to code-sample workspace
parent
a7780b8e
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
27 additions
and
3 deletions
+27
-3
currentWorkspace.ts
apps/remix-ide-e2e/src/commands/currentWorkspace.ts
+17
-0
url.spec.ts
apps/remix-ide-e2e/src/tests/url.spec.ts
+6
-1
index.d.ts
apps/remix-ide-e2e/src/types/index.d.ts
+1
-0
remix-ui-workspace.tsx
libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx
+3
-2
No files found.
apps/remix-ide-e2e/src/commands/currentWorkspace.ts
0 → 100644
View file @
03361824
import
{
NightwatchBrowser
}
from
'nightwatch'
import
EventEmitter
from
'events'
class
CurrentWorkspace
extends
EventEmitter
{
command
(
this
:
NightwatchBrowser
,
name
:
string
):
NightwatchBrowser
{
this
.
api
.
execute
(()
=>
{
return
(
document
.
querySelector
(
'select[data-id="workspacesSelect"]'
)
as
any
).
value
},
[],
(
result
)
=>
{
this
.
api
.
assert
.
equal
(
result
.
value
,
name
)
this
.
emit
(
'complete'
)
})
return
this
}
}
module
.
exports
=
CurrentWorkspace
apps/remix-ide-e2e/src/tests/url.spec.ts
View file @
03361824
...
...
@@ -10,7 +10,7 @@ const sources = [
module
.
exports
=
{
before
:
function
(
browser
:
NightwatchBrowser
,
done
:
VoidFunction
)
{
init
(
browser
,
done
,
'http://127.0.0.1:8080/#optimize=true&runs=300&evmVersion=istanbul&version=soljson-v0.7.4+commit.3f05b770.js
&code=cHJhZ21hIHNvbGlkaXR5ID49MC42LjAgPDAuNy4wOwoKaW1wb3J0ICJodHRwczovL2dpdGh1Yi5jb20vT3BlblplcHBlbGluL29wZW56ZXBwZWxpbi1jb250cmFjdHMvYmxvYi9tYXN0ZXIvY29udHJhY3RzL2FjY2Vzcy9Pd25hYmxlLnNvbCI7Cgpjb250cmFjdCBHZXRQYWlkIGlzIE93bmFibGUgewogIGZ1bmN0aW9uIHdpdGhkcmF3KCkgZXh0ZXJuYWwgb25seU93bmVyIHsKICB9Cn0
'
,
true
)
init
(
browser
,
done
,
'http://127.0.0.1:8080/#optimize=true&runs=300&evmVersion=istanbul&version=soljson-v0.7.4+commit.3f05b770.js'
,
true
)
},
'@sources'
:
function
()
{
...
...
@@ -19,6 +19,11 @@ module.exports = {
'Should load the code from URL params'
:
function
(
browser
:
NightwatchBrowser
)
{
browser
.
pause
(
5000
)
.
url
(
'http://127.0.0.1:8080/#optimize=true&runs=300&evmVersion=istanbul&version=soljson-v0.7.4+commit.3f05b770.js&code=cHJhZ21hIHNvbGlkaXR5ID49MC42LjAgPDAuNy4wOwoKaW1wb3J0ICJodHRwczovL2dpdGh1Yi5jb20vT3BlblplcHBlbGluL29wZW56ZXBwZWxpbi1jb250cmFjdHMvYmxvYi9tYXN0ZXIvY29udHJhY3RzL2FjY2Vzcy9Pd25hYmxlLnNvbCI7Cgpjb250cmFjdCBHZXRQYWlkIGlzIE93bmFibGUgewogIGZ1bmN0aW9uIHdpdGhkcmF3KCkgZXh0ZXJuYWwgb25seU93bmVyIHsKICB9Cn0'
)
.
refresh
()
// we do one reload for making sure we already have the default workspace
.
pause
(
5000
)
.
currentWorkspace
(
'code-sample2'
)
.
getEditorValue
((
content
)
=>
{
browser
.
assert
.
ok
(
content
.
indexOf
(
'https://github.com/OpenZeppelin/openzeppelin-contracts/blob/master/contracts/access/Ownable.sol'
)
!==
-
1
,
...
...
apps/remix-ide-e2e/src/types/index.d.ts
View file @
03361824
...
...
@@ -56,6 +56,7 @@ declare module "nightwatch" {
checkAnnotations
(
type
:
string
,
line
:
number
):
NightwatchBrowser
checkAnnotationsNotPresent
(
type
:
string
):
NightwatchBrowser
getLastTransactionHash
(
callback
:
(
hash
:
string
)
=>
void
)
currentWorkspace
(
name
:
string
):
NightwatchBrowser
}
export
interface
NightwatchBrowser
{
...
...
libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx
View file @
03361824
...
...
@@ -74,9 +74,10 @@ export const Workspace = (props: WorkspaceProps) => {
let
getWorkspaces
=
async
()
=>
{
if
(
props
.
workspaces
&&
Array
.
isArray
(
props
.
workspaces
))
{
if
(
props
.
workspaces
.
length
>
0
&&
state
.
currentWorkspace
===
NO_WORKSPACE
)
{
await
props
.
workspace
.
setWorkspace
(
props
.
workspaces
[
0
])
const
currentWorkspace
=
props
.
workspace
.
getWorkspace
()
?
props
.
workspace
.
getWorkspace
()
:
props
.
workspaces
[
0
]
await
props
.
workspace
.
setWorkspace
(
currentWorkspace
)
setState
(
prevState
=>
{
return
{
...
prevState
,
workspaces
:
props
.
workspaces
,
currentWorkspace
:
props
.
workspaces
[
0
]
}
return
{
...
prevState
,
workspaces
:
props
.
workspaces
,
currentWorkspace
}
})
}
else
{
setState
(
prevState
=>
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment