Provide a free-function to delete an existing session

Issue tebeka#148

Author: minusnine

remote.go

@@ -12,6 +12,8 @@ import (
 	"io/ioutil"
 	"mime"
 	"net/http"
+	"net/url"
+	"path"
 	"strings"
 	"time"
 
@@ -122,6 +124,10 @@ func (e *Error) Error() string {
 // encoded by the remote end in a JSON structure. If no error is present, the
 // entire, raw request payload is returned.
 func (wd *remoteWD) execute(method, url string, data []byte) (json.RawMessage, error) {
+	return executeCommand(method, url, data)
+}
+
+func executeCommand(method, url string, data []byte) (json.RawMessage, error) {
 	debugLog("-> %s %s\n%s", method, filteredURL(url), data)
 	request, err := newRequest(method, url, data)
 	if err != nil {
@@ -213,7 +219,7 @@ const DefaultURLPrefix = "http://127.0.0.1:4444/wd/hub"
 // Providing an empty string for urlPrefix causes the DefaultURLPrefix to be
 // used.
 func NewRemote(capabilities Capabilities, urlPrefix string) (WebDriver, error) {
-	if len(urlPrefix) == 0 {
+	if urlPrefix == "" {
 		urlPrefix = DefaultURLPrefix
 	}
 
@@ -230,6 +236,17 @@ func NewRemote(capabilities Capabilities, urlPrefix string) (WebDriver, error) {
 	return wd, nil
 }
 
+// DeleteSession deletes an existing session at the WebDriver instance
+// specified by the urlPrefix and the session ID.
+func DeleteSession(urlPrefix, id string) error {
+	u, err := url.Parse(urlPrefix)
+	if err != nil {
+		return err
+	}
+	u.Path = path.Join(u.Path, "session", id)
+	return voidCommand("DELETE", u.String(), nil)
+}
+
 func (wd *remoteWD) stringCommand(urlTemplate string) (string, error) {
 	url := wd.requestURL(urlTemplate, wd.id)
 	response, err := wd.execute("GET", url, nil)
@@ -249,18 +266,22 @@ func (wd *remoteWD) stringCommand(urlTemplate string) (string, error) {
 	return *reply.Value, nil
 }
 
-func (wd *remoteWD) voidCommand(urlTemplate string, params interface{}) error {
+func voidCommand(method, url string, params interface{}) error {
 	if params == nil {
 		params = make(map[string]interface{})
 	}
 	data, err := json.Marshal(params)
 	if err != nil {
 		return err
 	}
-	_, err = wd.execute("POST", wd.requestURL(urlTemplate, wd.id), data)
+	_, err = executeCommand(method, url, data)
 	return err
 }
 
+func (wd *remoteWD) voidCommand(urlTemplate string, params interface{}) error {
+	return voidCommand("POST", wd.requestURL(urlTemplate, wd.id), params)
+}
+
 func (wd remoteWD) stringsCommand(urlTemplate string) ([]string, error) {
 	url := wd.requestURL(urlTemplate, wd.id)
 	response, err := wd.execute("GET", url, nil)

remote_test.go

@@ -535,6 +535,7 @@ func runTest(f func(*testing.T, config), c config) func(*testing.T) {
 func runTests(t *testing.T, c config) {
 	t.Run("Status", runTest(testStatus, c))
 	t.Run("NewSession", runTest(testNewSession, c))
+	t.Run("DeleteSession", runTest(testDeleteSession, c))
 	t.Run("Error", runTest(testError, c))
 	t.Run("ExtendedErrorMessage", runTest(testExtendedErrorMessage, c))
 	t.Run("Capabilities", runTest(testCapabilities, c))
@@ -627,6 +628,15 @@ func testNewSession(t *testing.T, c config) {
 	}
 }
 
+func testDeleteSession(t *testing.T, c config) {
+	wd := newRemote(t, c)
+	defer quitRemote(t, wd)
+
+	if err := DeleteSession(c.addr, wd.SessionID()); err != nil {
+		t.Fatalf("DeleteSession(%s, %s) returned error: %v", c.addr, wd.SessionID(), err)
+	}
+}
+
 func testError(t *testing.T, c config) {
 	wd := newRemote(t, c)
 	defer quitRemote(t, wd)