refractor: remove redundant functions

mkfsn · Nov 13, 2020 · 9249c5b · 9249c5b
1 parent f297e67
commit 9249c5b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 24 deletions.
diff --git a/must.go b/must.go
@@ -488,21 +488,6 @@ func (p *Page) MustElementsByJS(js string, params ...interface{}) Elements {
 	return list
 }
 
-// MustElement is similar to Element
-func (rc *RaceContext) MustElement(selector string) *RaceContext {
-	return rc.Element(selector)
-}
-
-// MustElementX is similar to ElementX
-func (rc *RaceContext) MustElementX(selector string) *RaceContext {
-	return rc.ElementX(selector)
-}
-
-// MustElementR is similar to ElementR
-func (rc *RaceContext) MustElementR(selector, regex string) *RaceContext {
-	return rc.ElementR(selector, regex)
-}
-
 // MustElementByJS is similar to ElementByJS
 func (rc *RaceContext) MustElementByJS(js string, params []interface{}) *RaceContext {
 	return rc.ElementByJS(Eval(js, params...))

diff --git a/query_test.go b/query_test.go
@@ -122,23 +122,23 @@ func (t T) SearchIframesAfterReload() {
 func (t T) PageRace() {
 	p := t.page.MustNavigate(t.srcFile("fixtures/selector.html"))
 
-	p.Race().MustElement("button").MustHandle(func(e *rod.Element) { t.Eq("01", e.MustText()) }).MustDo()
-	t.Eq("01", p.Race().MustElement("button").MustDo().MustText())
+	p.Race().Element("button").MustHandle(func(e *rod.Element) { t.Eq("01", e.MustText()) }).MustDo()
+	t.Eq("01", p.Race().Element("button").MustDo().MustText())
 
-	p.Race().MustElementX("//button").MustHandle(func(e *rod.Element) { t.Eq("01", e.MustText()) }).MustDo()
-	t.Eq("01", p.Race().MustElementX("//button").MustDo().MustText())
+	p.Race().ElementX("//button").MustHandle(func(e *rod.Element) { t.Eq("01", e.MustText()) }).MustDo()
+	t.Eq("01", p.Race().ElementX("//button").MustDo().MustText())
 
-	p.Race().MustElementR("button", "02").MustHandle(func(e *rod.Element) { t.Eq("02", e.MustText()) }).MustDo()
-	t.Eq("02", p.Race().MustElementR("button", "02").MustDo().MustText())
+	p.Race().ElementR("button", "02").MustHandle(func(e *rod.Element) { t.Eq("02", e.MustText()) }).MustDo()
+	t.Eq("02", p.Race().ElementR("button", "02").MustDo().MustText())
 
 	p.Race().MustElementByJS("document.querySelector('button')", nil).
 		MustHandle(func(e *rod.Element) { t.Eq("01", e.MustText()) }).MustDo()
 	t.Eq("01", p.Race().MustElementByJS("document.querySelector('button')", nil).MustDo().MustText())
 
 	el, err := p.Sleeper(func() utils.Sleeper { return utils.CountSleeper(2) }).Race().
-		MustElement("not-exists").MustHandle(func(e *rod.Element) {}).
-		MustElementX("//not-exists").
-		MustElementR("not-exists", "test").MustHandle(func(e *rod.Element) {}).
+		Element("not-exists").MustHandle(func(e *rod.Element) {}).
+		ElementX("//not-exists").
+		ElementR("not-exists", "test").MustHandle(func(e *rod.Element) {}).
 		Do()
 	t.Err(err)
 	t.Nil(el)