Skip to content

Commit

Permalink
Remove the unfinished chrome_ios product (#3569)
Browse files Browse the repository at this point in the history
* Remove unused variable that causes hterm error

* Revert "Add chrome_ios as a browser name (#3087)"

This reverts commit 0b31816 since the
work to upload Chrome iOS runs isn't going to happen any time soon.
  • Loading branch information
past authored Oct 28, 2023
1 parent 3cdefdd commit 8a13f91
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 8 deletions.
2 changes: 1 addition & 1 deletion shared/browsers.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ var defaultBrowsers = []string{

// An extra list of known browsers.
var extraBrowsers = []string{
"android_webview", "chrome_android", "chrome_ios", "chromium", "deno", "epiphany", "firefox_android", "flow", "node.js", "servo", "uc", "wktr", "webkitgtk",
"android_webview", "chrome_android", "chromium", "deno", "epiphany", "firefox_android", "flow", "node.js", "servo", "uc", "wktr", "webkitgtk",
}

var allBrowsers mapset.Set
Expand Down
3 changes: 1 addition & 2 deletions shared/browsers_test.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build small
// +build small

// Copyright 2017 The WPT Dashboard Project. All rights reserved.
Expand All @@ -20,7 +21,6 @@ func TestGetDefaultBrowserNames(t *testing.T) {
for _, n := range names {
assert.NotEqual(t, "android_webview", n)
assert.NotEqual(t, "chrome_android", n)
assert.NotEqual(t, "chrome_ios", n)
assert.NotEqual(t, "chromium", n)
assert.NotEqual(t, "deno", n)
assert.NotEqual(t, "epiphany", n)
Expand All @@ -45,7 +45,6 @@ func TestIsBrowserName(t *testing.T) {
assert.True(t, IsBrowserName("node.js"))
assert.True(t, IsBrowserName("safari"))
assert.True(t, IsBrowserName("chrome_android"))
assert.True(t, IsBrowserName("chrome_ios"))
assert.True(t, IsBrowserName("android_webview"))
assert.True(t, IsBrowserName("epiphany"))
assert.True(t, IsBrowserName("servo"))
Expand Down
2 changes: 0 additions & 2 deletions shared/product_spec.go
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,6 @@ func (p ProductSpec) DisplayName() string {
return "Chromium"
case "chrome_android":
return "ChromeAndroid"
case "chrome_ios":
return "ChromeIOS"
case "android_webview":
return "WebView"
case "deno":
Expand Down
1 change: 0 additions & 1 deletion util/commands.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#!/bin/bash

DOCKER_DIR=$(dirname $0)
DOCKER_IMAGE=${DOCKER_IMAGE:-"webplatformtests/wpt.fyi:latest"}
DOCKER_INSTANCE=${DOCKER_INSTANCE:-"wptd-dev-instance"}
WPTD_HOST_WEB_PORT=${WPTD_HOST_WEB_PORT:-"8080"}
Expand Down
3 changes: 1 addition & 2 deletions webapp/components/product-info.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ const DisplayNames = (() => {
['safari', 'safari-experimental'].forEach(n => m.set(n, 'Safari'));
m.set('android_webview', 'WebView');
m.set('chrome_android', 'ChromeAndroid');
m.set('chrome_ios', 'ChromeIOS');
m.set('chromium', 'Chromium');
m.set('deno', 'Deno');
m.set('firefox_android', 'Firefox Android');
Expand Down Expand Up @@ -47,7 +46,7 @@ const versionPatterns = Object.freeze({
});

// The set of all browsers known to the wpt.fyi UI.
const AllBrowserNames = Object.freeze(['android_webview', 'chrome_android', 'chrome_ios', 'chrome',
const AllBrowserNames = Object.freeze(['android_webview', 'chrome_android', 'chrome',
'chromium', 'deno', 'edge', 'firefox_android', 'firefox', 'flow', 'node.js', 'safari', 'servo', 'webkitgtk', 'wktr']);

// The list of default browsers used in cases where the user has not otherwise
Expand Down

0 comments on commit 8a13f91

Please sign in to comment.