diff --git a/.travis.yml b/.travis.yml index db5e33c..3db3df2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ go: addons: # Use the full version number with ".0" if needed. This value is scraped by setup scripts. - firefox: "58.0" + firefox: "60.0" apt: packages: - rpm diff --git a/interfacer/src/browsh/browsh.go b/interfacer/src/browsh/browsh.go index 76de30f..56000a1 100644 --- a/interfacer/src/browsh/browsh.go +++ b/interfacer/src/browsh/browsh.go @@ -28,7 +28,7 @@ var ( isUseExistingFirefox = flag.Bool("use-existing-ff", false, "Whether Browsh should launch Firefox or not") useFFProfile = flag.String("ff-profile", "default", "Firefox profile to use") isDebug = flag.Bool("debug", false, "Log to ./debug.log") - startupURL = flag.String("startup-url", "https://google.com", "URL to launch at startup") + StartupURL = flag.String("startup-url", "https://google.com", "URL to launch at startup") timeLimit = flag.Int("time-limit", 0, "Kill Browsh after the specified number of seconds") // IsHTTPServer needs to be exported for use in tests IsHTTPServer = flag.Bool("http-server", false, "Run as an HTTP service") diff --git a/interfacer/src/browsh/firefox.go b/interfacer/src/browsh/firefox.go index 24f4d50..8cac47f 100644 --- a/interfacer/src/browsh/firefox.go +++ b/interfacer/src/browsh/firefox.go @@ -108,7 +108,7 @@ func startWERFirefox() { "--firefox=" + rootDir + "/webext/contrib/firefoxheadless.sh", "--verbose", "--no-reload", - "--url=https://www.google.com", + "--url=" + *StartupURL, } firefoxProcess := exec.Command(rootDir + "/webext/node_modules/.bin/web-ext", args...) firefoxProcess.Dir = rootDir + "/webext/dist/" @@ -204,7 +204,7 @@ func loadHomePage() { // Wait for the CLI websocket server to start listening time.Sleep(200 * time.Millisecond) args := map[string]interface{}{ - "url": *startupURL, + "url": *StartupURL, } sendFirefoxCommand("get", args) } diff --git a/interfacer/test/tty/setup.go b/interfacer/test/tty/setup.go index d24dd9b..9c6072c 100644 --- a/interfacer/test/tty/setup.go +++ b/interfacer/test/tty/setup.go @@ -15,7 +15,7 @@ import ( var staticFileServerPort = "4444" var simScreen tcell.SimulationScreen -var startupWait = 30 * time.Second +var startupWait = 60 * time.Second var perTestTimeout = 2000 * time.Millisecond var rootDir = browsh.Shell("git rev-parse --show-toplevel") var testSiteURL = "http://localhost:" + staticFileServerPort diff --git a/webext/manifest.json b/webext/manifest.json index d55ed21..249c9d0 100644 --- a/webext/manifest.json +++ b/webext/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 2, "name": "Browsh", - "version": "1.0.1", + "version": "1.0.2", "description": "Renders the browser as realtime, interactive, TTY-compatible text",