Merge branch 'topic/external-testing'

tebeka · Aug 6, 2019 · 1131f5e · 1131f5e
2 parents 004f2b0 + b41ca4d
commit 1131f5e
Show file tree

Hide file tree

Showing 8 changed files with 1,781 additions and 1,855 deletions.
diff --git a/internal/seleniumtest/seleniumtest.go b/internal/seleniumtest/seleniumtest.go
diff --git a/remote_test.go b/remote_test.go
diff --git a/sauce_test.go b/sauce_test.go
@@ -1,4 +1,4 @@
-package selenium
+package selenium_test
 
 import (
 	"flag"
@@ -7,6 +7,8 @@ import (
 	"testing"
 
 	"github.com/blang/semver"
+	"github.com/tebeka/selenium"
+	"github.com/tebeka/selenium/internal/seleniumtest"
 	"github.com/tebeka/selenium/sauce"
 )
 
@@ -22,7 +24,7 @@ func TestSauce(t *testing.T) {
 		t.Skip("Skipping Sauce tests. Enable via --experimental_sauce_tests")
 	}
 	if testing.Verbose() {
-		SetDebug(true)
+		selenium.SetDebug(true)
 	}
 	if *sauceUserName == "" {
 		t.Fatalf("--sauce_user_name is required.")
@@ -69,17 +71,19 @@ func TestSauce(t *testing.T) {
 		browser, version := strings.ToLower(browser), strings.ToLower(tc.version)
 
 		t.Run(name, func(t *testing.T) {
-			runFirefoxSubTests(t, config{
-				browser:         browser,
-				seleniumVersion: semver.MustParse(tc.selenium),
-				sauce: &sauce.Capabilities{
+			c := seleniumtest.Config{
+				Browser:         browser,
+				SeleniumVersion: semver.MustParse(tc.selenium),
+				Sauce: &sauce.Capabilities{
 					Browser:         browser,
 					Version:         version,
 					Platform:        tc.platform,
 					SeleniumVersion: tc.selenium,
 				},
-				addr: addr,
-			})
+				Addr: addr,
+			}
+			seleniumtest.RunCommonTests(t, c)
+			seleniumtest.RunFirefoxTests(t, c)
 		})
 	}
 }
diff --git a/...rome-extension/css_page_red/manifest.json → ...rome_extension/css_page_red/manifest.json b/...rome-extension/css_page_red/manifest.json → ...rome_extension/css_page_red/manifest.json
diff --git a/...ing/chrome-extension/css_page_red/red.css → ...ing/chrome_extension/css_page_red/red.css b/...ing/chrome-extension/css_page_red/red.css → ...ing/chrome_extension/css_page_red/red.css
diff --git a/testing/firefox-profile/prefs.js → testing/firefox_profile/prefs.js b/testing/firefox-profile/prefs.js → testing/firefox_profile/prefs.js
diff --git a/testing/firefox-profile/times.json → testing/firefox_profile/times.json b/testing/firefox-profile/times.json → testing/firefox_profile/times.json
diff --git a/testing/firefox-profile/user.js → testing/firefox_profile/user.js b/testing/firefox-profile/user.js → testing/firefox_profile/user.js