mirror
/
remix-project
mirror of https://github.com/ethereum/remix-project.git
2
0
Fork 0
Code Issues Releases Wiki Activity

fix bugs & tests

Browse Source
pull/2257/head^2
filip mertens 3 years ago committed by yann300
parent 9524c22d26
commit beb47308ff
6 changed files with 223 additions and 210 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 67
      apps/remix-ide-e2e/src/tests/search.test.ts
  2. 11
      libs/remix-ui/search/src/lib/components/Exclude.tsx
  3. 6
      libs/remix-ui/search/src/lib/components/Find.tsx
  4. 7
      libs/remix-ui/search/src/lib/components/Include.tsx
  5. 8
      libs/remix-ui/search/src/lib/context/context.tsx
  6. 10
      libs/remix-ui/search/src/lib/reducers/Reducer.ts

67
apps/remix-ide-e2e/src/tests/search.test.ts
Unescape View File

@ -10,7 +10,10 @@ module.exports = {
'Should find text': function (browser: NightwatchBrowser) {
browser.waitForElementVisible('*[data-id="remixIdeSidePanel"]')
.click('*[plugin="search"]').waitForElementVisible('*[id="search_input"]')
.setValue('*[id="search_input"]', 'read').pause(1000)
.waitForElementVisible('*[id="search_include"]')
.setValue('*[id="search_include"]', ', *.txt').pause(2000)
.setValue('*[id="search_input"]', 'read').sendKeys('*[id="search_input"]', browser.Keys.ENTER)
.pause(1000)
.waitForElementContainsText('*[data-id="search_results"]', '3_BALLOT.SOL', 60000)
.waitForElementContainsText('*[data-id="search_results"]', 'contracts', 60000)
.waitForElementContainsText('*[data-id="search_results"]', 'README.TXT', 60000)
@ -23,16 +26,32 @@ module.exports = {
Array.isArray(res.value) && browser.assert.equal(res.value.length, 6)
})
},
'Should find text with exclude': function (browser: NightwatchBrowser) {
browser
.clearValue('*[id="search_input"]')
.setValue('*[id="search_input"]', 'contract').pause(1000)
.clearValue('*[id="search_include"]').pause(2000)
.setValue('*[id="search_include"]', '**').sendKeys('*[id="search_include"]', browser.Keys.ENTER).pause(4000)
.elements('css selector', '.search_plugin_search_line', (res) => {
Array.isArray(res.value) && browser.assert.equal(res.value.length, 45)
})
.setValue('*[id="search_exclude"]', ',contracts/**').sendKeys('*[id="search_exclude"]', browser.Keys.ENTER).pause(4000)
.elements('css selector', '.search_plugin_search_line', (res) => {
Array.isArray(res.value) && browser.assert.equal(res.value.length, 40)
})
.clearValue('*[id="search_include"]').setValue('*[id="search_include"]', '*.sol, *.js, *.txt')
.clearValue('*[id="search_exclude"]').setValue('*[id="search_exclude"]', '.*/**/*')
},
'Should find regex': function (browser: NightwatchBrowser) {
browser
.waitForElementVisible('*[data-id="search_use_regex"]').click('*[data-id="search_use_regex"]')
.waitForElementVisible('*[id="search_input"]')
.clearValue('*[id="search_input"]')
.setValue('*[id="search_input"]', '^contract').pause(1000)
.setValue('*[id="search_input"]', '^contract').sendKeys('*[id="search_input"]', browser.Keys.ENTER)
.waitForElementContainsText('*[data-id="search_results"]', '3_BALLOT.SOL', 60000)
.waitForElementContainsText('*[data-id="search_results"]', '2_OWNER.SOL', 60000)
.waitForElementContainsText('*[data-id="search_results"]', '1_STORAGE.SOL', 60000)
.waitForElementContainsText('*[data-id="search_results"]', 'BALLOT_TEST.SOL', 60000)
.waitForElementContainsText('*[data-id="search_results"]', '4_BALLOT_TEST.SOL', 60000)
.waitForElementContainsText('*[data-id="search_results"]', 'tests', 60000)
.elements('css selector', '.search_plugin_search_line', (res) => {
Array.isArray(res.value) && browser.assert.equal(res.value.length, 4)
@ -41,12 +60,12 @@ module.exports = {
'Should find matchcase': function (browser: NightwatchBrowser) {
browser
.waitForElementVisible('*[data-id="search_use_regex"]').click('*[data-id="search_use_regex"]')
.waitForElementVisible('*[data-id="search_case_sensitive"]').click('*[data-id="search_case_sensitive"]')
.waitForElementVisible('*[data-id="search_case_sensitive"]').click('*[data-id="search_case_sensitive"]').pause(4000)
.elements('css selector', '.search_plugin_search_line', (res) => {
Array.isArray(res.value) && browser.assert.equal(res.value.length, 0)
})
.clearValue('*[id="search_input"]')
.setValue('*[id="search_input"]', 'Contract').pause(1000)
.setValue('*[id="search_input"]', 'Contract').sendKeys('*[id="search_input"]', browser.Keys.ENTER).pause(1000)
.elements('css selector', '.search_plugin_search_line', (res) => {
Array.isArray(res.value) && browser.assert.equal(res.value.length, 9)
})
@ -58,9 +77,9 @@ module.exports = {
'Should find matchword': function (browser: NightwatchBrowser) {
browser
.waitForElementVisible('*[data-id="search_case_sensitive"]').click('*[data-id="search_case_sensitive"]')
.waitForElementVisible('*[data-id="search_whole_word"]').click('*[data-id="search_whole_word"]')
.waitForElementVisible('*[data-id="search_whole_word"]').click('*[data-id="search_whole_word"]').pause(2000)
.clearValue('*[id="search_input"]')
.setValue('*[id="search_input"]', 'contract').pause(1000)
.setValue('*[id="search_input"]', 'contract').sendKeys('*[id="search_input"]', browser.Keys.ENTER).pause(4000)
.elements('css selector', '.search_plugin_search_line', (res) => {
Array.isArray(res.value) && browser.assert.equal(res.value.length, 29)
})
@ -82,7 +101,7 @@ module.exports = {
'Should replace text without confirmation': function (browser: NightwatchBrowser) {
browser.click('*[data-id="confirm_replace_label"]').pause(500)
.clearValue('*[id="search_input"]')
.setValue('*[id="search_input"]', 'replacing').pause(1000)
.setValue('*[id="search_input"]', 'replacing').sendKeys('*[id="search_input"]', browser.Keys.ENTER).pause(1000)
.setValue('*[id="search_replace"]', '2').pause(1000)
.waitForElementVisible('*[data-id="contracts/2_Owner.sol-30-71"]')
.moveToElement('*[data-id="contracts/2_Owner.sol-30-71"]', 10, 10)
@ -95,7 +114,7 @@ module.exports = {
'Should replace all & undo': function (browser: NightwatchBrowser) {
browser
.clearValue('*[id="search_input"]')
.setValue('*[id="search_input"]', 'storage')
.setValue('*[id="search_input"]', 'storage').sendKeys('*[id="search_input"]', browser.Keys.ENTER)
.clearValue('*[id="search_replace"]')
.setValue('*[id="search_replace"]', '123test').pause(1000)
.waitForElementVisible('*[data-id="replace-all-contracts/1_Storage.sol"]')
@ -114,7 +133,7 @@ module.exports = {
'Should replace all & undo & switch between files': function (browser: NightwatchBrowser) {
browser.waitForElementVisible('*[id="search_input"]')
.clearValue('*[id="search_input"]')
.setValue('*[id="search_input"]', 'storage')
.setValue('*[id="search_input"]', 'storage').sendKeys('*[id="search_input"]', browser.Keys.ENTER)
.clearValue('*[id="search_replace"]')
.setValue('*[id="search_replace"]', '123test').pause(1000)
.waitForElementVisible('*[data-id="replace-all-contracts/1_Storage.sol"]')
@ -152,7 +171,7 @@ module.exports = {
.addFile('test.sol', { content: '123' })
.click('*[plugin="search"]').waitForElementVisible('*[id="search_input"]')
.clearValue('*[id="search_input"]')
.setValue('*[id="search_input"]', '123')
.setValue('*[id="search_input"]', '123').sendKeys('*[id="search_input"]', browser.Keys.ENTER)
.clearValue('*[id="search_replace"]')
.setValue('*[id="search_replace"]', '456').pause(1000)
.waitForElementVisible('*[data-id="replace-all-test.sol"]')
@ -172,7 +191,7 @@ module.exports = {
browser
.waitForElementVisible('*[id="search_input"]')
.clearValue('*[id="search_input"]')
.setValue('*[id="search_input"]', '123')
.setValue('*[id="search_input"]', '123').sendKeys('*[id="search_input"]', browser.Keys.ENTER)
.clearValue('*[id="search_replace"]')
.setValue('*[id="search_replace"]', 'replaced').pause(1000)
.waitForElementVisible('*[data-id="replace-all-test.sol"]')
@ -205,31 +224,11 @@ module.exports = {
})
.waitForElementNotPresent('*[data-id="undo-replace-test.sol"]')
},
'Should find text with include': function (browser: NightwatchBrowser) {
browser
.clearValue('*[id="search_input"]')
.setValue('*[id="search_input"]', 'contract').pause(1000)
.setValue('*[id="search_include"]', 'contracts/**').pause(2000)
.elements('css selector','.search_plugin_search_line', (res) => {
Array.isArray(res.value) && browser.assert.equal(res.value.length, 4)
})
},
'Should find text with exclude': function (browser: NightwatchBrowser) {
browser
.clearValue('*[id="search_include"]').pause(2000)
.setValue('*[id="search_include"]', '**').pause(2000)
.elements('css selector','.search_plugin_search_line', (res) => {
Array.isArray(res.value) && browser.assert.equal(res.value.length, 28)
})
.setValue('*[id="search_exclude"]', ',contracts/**').pause(2000)
.elements('css selector','.search_plugin_search_line', (res) => {
Array.isArray(res.value) && browser.assert.equal(res.value.length, 24)
})
},
'should clear search': function (browser: NightwatchBrowser) {
browser
.waitForElementVisible('*[id="search_input"]')
.setValue('*[id="search_input"]', 'nodata').pause(1000)
.setValue('*[id="search_input"]', 'nodata').sendKeys('*[id="search_input"]', browser.Keys.ENTER).pause(1000)
.elements('css selector', '.search_plugin_search_line', (res) => {
Array.isArray(res.value) && browser.assert.equal(res.value.length, 0)
})

11
libs/remix-ui/search/src/lib/components/Exclude.tsx
Unescape View File

@ -2,7 +2,7 @@ import React, { useContext, useEffect, useRef, useState } from 'react'
import { SearchContext } from '../context/context'
export const Exclude = props => {
const { setExclude, cancelSearch } = useContext(SearchContext)
const { setExclude, cancelSearch, startSearch } = useContext(SearchContext)
const [excludeInput, setExcludeInput] = useState<string>('.*/**/*')
const change = async e => {
@ -11,8 +11,9 @@ export const Exclude = props => {
}
const handleKeypress = async e => {
if (e.charCode === 13 || e.keyCode === 13) {
await setExclude(excludeInput)
if (e.charCode === 13 || e.keyCode === 13) {
startSearch()
}
}
@ -25,10 +26,10 @@ export const Exclude = props => {
<div className="search_plugin_find-part pl-3">
<label className='mt-2'>Files to exclude</label>
<input
id='search_exclude ( Enter to exclude )'
placeholder="Exclude ie .git/**/*"
id='search_exclude'
placeholder="Exclude ie .git/**/* ( Enter to exclude )"
className="form-control"
onKeyPress={handleKeypress}
onKeyUp={handleKeypress}
onChange={async (e) => change(e)}
value={excludeInput}
></input>

6
libs/remix-ui/search/src/lib/components/Find.tsx
Unescape View File

@ -5,6 +5,7 @@ export const Find = () => {
const {
setFind,
cancelSearch,
startSearch,
state,
toggleCaseSensitive,
toggleMatchWholeWord,
@ -19,8 +20,9 @@ export const Find = () => {
const handleKeypress = async e => {
if (e.charCode === 13 || e.keyCode === 13) {
await setFind(inputValue)
startSearch()
}
await setFind(inputValue)
}
useEffect(() => {
@ -37,7 +39,7 @@ export const Find = () => {
className="form-control"
value={inputValue}
onChange={async e => await change(e)}
onKeyPress={handleKeypress}
onKeyUp={handleKeypress}
></input>
<div className="search_plugin_controls">
<div

7
libs/remix-ui/search/src/lib/components/Include.tsx
Unescape View File

@ -2,15 +2,16 @@ import React, { useContext, useEffect, useRef, useState } from 'react'
import { SearchContext } from '../context/context'
export const Include = props => {
const { setInclude, cancelSearch } = useContext(SearchContext)
const { setInclude, cancelSearch, startSearch } = useContext(SearchContext)
const [includeInput, setIncludeInput] = useState<string>('*.sol, *.js')
const change = async e => {
setIncludeInput(e.target.value)
await cancelSearch()
}
const handleKeypress = async e => {
if (e.charCode === 13 || e.keyCode === 13) {
await setInclude(includeInput)
if (e.charCode === 13 || e.keyCode === 13) {
startSearch()
}
}
@ -27,7 +28,7 @@ export const Include = props => {
placeholder="Include ie *.sol ( Enter to include )"
className="form-control"
onChange={async(e) => change(e)}
onKeyPress={handleKeypress}
onKeyUp={handleKeypress}
value={includeInput}
></input>
</div>

8
libs/remix-ui/search/src/lib/context/context.tsx
Unescape View File

@ -46,6 +46,7 @@ export interface SearchingStateInterface {
undoReplace: (buffer: undoBufferRecord) => Promise<void>
clearUndo: () => void
cancelSearch: (clearResults?:boolean) => Promise<void>
startSearch: () => void
}
export const SearchContext = createContext<SearchingStateInterface>(null)
@ -177,6 +178,13 @@ export const SearchProvider = ({
})
},
startSearch: () => {
dispatch({
type: 'START_SEARCH',
payload: undefined
})
},
setRun(value: boolean) {
dispatch({
type: 'SET_RUN',

10
libs/remix-ui/search/src/lib/reducers/Reducer.ts
Unescape View File

@ -2,12 +2,16 @@ import { Action, SearchingInitialState, SearchState, undoBufferRecord } from "..
export const SearchReducer = (state: SearchState = SearchingInitialState, action: Action) => {
switch (action.type) {
case 'START_SEARCH':
return {
...state,
timeStamp: Date.now()
}
case 'SET_FIND':
return {
...state,
searchResults: null,
find: action.payload,
timeStamp: Date.now()
find: action.payload
}
case 'SET_REPLACE':
@ -26,14 +30,12 @@ export const SearchReducer = (state: SearchState = SearchingInitialState, action
return {
...state,
include: action.payload,
timeStamp: Date.now()
}
case 'SET_EXCLUDE':
return {
...state,
exclude: action.payload,
timeStamp: Date.now()
}
case 'SET_SEARCH_RESULTS':

Write Preview
Loading…
Cancel
Save