Links
+ Link 1 + Link 2 + Link 3 + Link 4 + Link 5 + + Link 6 + Link 7 + Link 8 + Link 9 + Link 10 + + Link 11 + Link 12 + Link 13 + Link 14 + Link 15 + + Link 16 + Link 17 + Link 18 + Link 19 + Link 20 + + diff --git a/interfacer/test/tty/setup.go b/interfacer/test/tty/setup.go index 628f4e96..f8566595 100644 --- a/interfacer/test/tty/setup.go +++ b/interfacer/test/tty/setup.go @@ -113,6 +113,7 @@ func waitForNextFrame() { func WaitForText(text string, x, y int) { var found string start := time.Now() + browsh.Log("expect " + text) for time.Since(start) < perTestTimeout { found = GetText(x, y, runeCount(text)) if found == text { @@ -120,7 +121,7 @@ func WaitForText(text string, x, y int) { } time.Sleep(100 * time.Millisecond) } - panic("Waiting for '" + text + "' to appear but it didn't") + browsh.Log("Waiting for '" + text + "' to appear but it didn't") } // WaitForPageLoad waits for the page to load @@ -133,6 +134,7 @@ func sleepUntilPageLoad(maxTime time.Duration) { time.Sleep(1000 * time.Millisecond) for time.Since(start) < maxTime { if browsh.CurrentTab != nil { + browsh.Log("pageload " + browsh.CurrentTab.PageState) if browsh.CurrentTab.PageState == "parsing_complete" { time.Sleep(200 * time.Millisecond) return @@ -140,18 +142,16 @@ func sleepUntilPageLoad(maxTime time.Duration) { } time.Sleep(50 * time.Millisecond) } - panic("Page didn't load within timeout") + browsh.Log("Page didn't load within timeout") } // GotoURL sends the browsh browser to the specified URL func GotoURL(url string) { - browsh.URLBarFocus(true) + browsh.Log("gotourl " + url) + SpecialKey(tcell.KeyCtrlL) Keyboard(url) SpecialKey(tcell.KeyEnter) WaitForPageLoad() - // Hack to force text to be rerendered. Because there's a bug where text sometimes doesn't get - // rendered. - mouseClick(3, 3) // TODO: Looking for the URL isn't optimal because it could be the same URL // as the previous test. gomega.Expect(url).To(BeInFrameAt(0, 1)) @@ -163,6 +163,16 @@ func GotoURL(url string) { time.Sleep(500 * time.Millisecond) } +func MouseClick() { + // TODO: hack to work around bug where text sometimes doesn't render on page load. + // Clicking with the mouse triggers a reparse by the web extension + time.Sleep(100 * time.Millisecond) + mouseClick(3, 6) + time.Sleep(500 * time.Millisecond) + mouseClick(3, 6) + time.Sleep(500 * time.Millisecond) +} + func mouseClick(x, y int) { simScreen.InjectMouse(x, y, 1, tcell.ModNone) simScreen.InjectMouse(x, y, 0, tcell.ModNone) @@ -217,7 +227,7 @@ func GetBgColour(x, y int) [3]int32 { } func ensureOnlyOneTab() { - for len(browsh.Tabs) > 1 { + if len(browsh.Tabs) > 1 { SpecialKey(tcell.KeyCtrlW) } } @@ -232,7 +242,6 @@ func initBrowsh() { browsh.IsTesting = true simScreen = tcell.NewSimulationScreen("UTF-8") browsh.Initialise() - } func stopFirefox() { @@ -247,18 +256,19 @@ func runeCount(text string) int { } var _ = ginkgo.BeforeEach(func() { + browsh.Log("\n---------") + browsh.Log(ginkgo.CurrentGinkgoTestDescription().FullTestText) + browsh.Log("---------") browsh.Log("Attempting to restart WER Firefox...") stopFirefox() browsh.ResetTabs() browsh.StartFirefox() sleepUntilPageLoad(startupWait) browsh.IsMonochromeMode = false - browsh.Log("\n---------") - browsh.Log(ginkgo.CurrentGinkgoTestDescription().FullTestText) - browsh.Log("---------") }) var _ = ginkgo.BeforeSuite(func() { + browsh.Log("BeforeSuite---------") os.Truncate(framesLogFile, 0) initTerm() initBrowsh() @@ -273,4 +283,5 @@ var _ = ginkgo.BeforeSuite(func() { var _ = ginkgo.AfterSuite(func() { stopFirefox() + browsh.Log("AfterSuite--------------") }) diff --git a/interfacer/test/tty/tty_test.go b/interfacer/test/tty/tty_test.go index b1380472..92a35175 100644 --- a/interfacer/test/tty/tty_test.go +++ b/interfacer/test/tty/tty_test.go @@ -3,18 +3,19 @@ package test import ( "browsh/interfacer/src/browsh" "testing" + "time" "github.com/gdamore/tcell" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) -func TestMain(t *testing.T) { +func TestIntegration(t *testing.T) { RegisterFailHandler(Fail) RunSpecs(t, "Integration tests") } -var _ = Describe("Core functionality", func() { +var _ = Describe("Showing a basic webpage", func() { BeforeEach(func() { GotoURL(testSiteURL + "/smorgasbord/") }) @@ -27,6 +28,31 @@ var _ = Describe("Core functionality", func() { }) Describe("Interaction", func() { + It("should navigate to a new page by using a link hint", func() { + Expect("Another▄page").To(BeInFrameAt(12, 18)) + Keyboard("f") + time.Sleep(500 * time.Millisecond) + Keyboard("a") + time.Sleep(500 * time.Millisecond) + Expect("Another").To(BeInFrameAt(0, 0)) + SpecialKey(tcell.KeyCtrlL) + Keyboard(testSiteURL + "/links.html") + SpecialKey(tcell.KeyEnter) + Expect("Links").To(BeInFrameAt(0, 0)) + Keyboard("f") + time.Sleep(500 * time.Millisecond) + Keyboard("a") + time.Sleep(500 * time.Millisecond) + Expect("Another").To(BeInFrameAt(0, 0)) + // TODO: test double keys + }) + + It("should scroll the page by one line", func() { + Expect("[ˈsmœrɡɔsˌbuːɖ])▄is▄a").To(BeInFrameAt(12, 11)) + Keyboard("j") + Expect("type▄of▄Scandinavian▄").To(BeInFrameAt(12, 11)) + }) + It("should navigate to a new page by using the URL bar", func() { SpecialKey(tcell.KeyCtrlL) Keyboard(testSiteURL + "/smorgasbord/another.html") @@ -133,21 +159,46 @@ var _ = Describe("Core functionality", func() { It("should create a new tab", func() { SpecialKey(tcell.KeyCtrlT) + Expect("New Tab").To(BeInFrameAt(21, 0)) Expect(len(browsh.Tabs)).To(Equal(2)) + // need this to make tcell to work for the next round + SpecialKey(tcell.KeyCtrlL) }) It("should be able to goto a new URL", func() { SpecialKey(tcell.KeyCtrlT) - GotoURL(testSiteURL + "/smorgasbord/another.html") - Expect("Another▄webpage").To(BeInFrameAt(1, 3)) + Keyboard(testSiteURL + "/smorgasbord/another.html") + SpecialKey(tcell.KeyEnter) + Expect("Another").To(BeInFrameAt(21, 0)) }) It("should cycle to the next tab", func() { - GotoURL(testSiteURL + "/smorgasbord/") SpecialKey(tcell.KeyCtrlT) - GotoURL(testSiteURL + "/smorgasbord/another.html") + Expect(" ").To(BeInFrameAt(0, 1)) + // SpecialKey(tcell.KeyCtrlL) stops working after ctrl-t + Keyboard(testSiteURL + "/smorgasbord/another.html") + SpecialKey(tcell.KeyEnter) + Expect("Another").To(BeInFrameAt(21, 0)) triggerUserKeyFor("tty.keys.next-tab") - Expect("Smörgåsbord").To(BeInFrameAt(0, 0)) + URL := testSiteURL + "/smorgasbord/ " + Expect(URL).To(BeInFrameAt(0, 1)) + }) + + It("should create a new tab", func() { + Keyboard("t") + Expect("New Tab").To(BeInFrameAt(21, 0)) + // need this to make tcell to work for the next round + SpecialKey(tcell.KeyCtrlL) + }) + + It("should cycle to the next tab", func() { + Keyboard("t") + Keyboard(testSiteURL + "/smorgasbord/another.html") + SpecialKey(tcell.KeyEnter) + Expect("Another").To(BeInFrameAt(21, 0)) + Keyboard("J") + URL := testSiteURL + "/smorgasbord/ " + Expect(URL).To(BeInFrameAt(0, 1)) }) }) }) diff --git a/interfacer/test/tty/vim_test.go b/interfacer/test/tty/vim_test.go deleted file mode 100644 index b52f7d73..00000000 --- a/interfacer/test/tty/vim_test.go +++ /dev/null @@ -1,52 +0,0 @@ -package test - -import ( - "testing" - - . "github.com/onsi/ginkgo" - . "github.com/onsi/gomega" -) - -func TestVim(t *testing.T) { - RegisterFailHandler(Fail) - RunSpecs(t, "Integration tests") -} - -var _ = Describe("Vim tests", func() { - BeforeEach(func() { - GotoURL(testSiteURL + "/smorgasbord/") - }) - - It("should navigate to a new page by using a link hint", func() { - Expect("Another▄page").To(BeInFrameAt(12, 18)) - Keyboard("f") - Keyboard("a") - Expect("Another").To(BeInFrameAt(0, 0)) - }) - - It("should scroll the page by one line", func() { - Expect("[ˈsmœrɡɔsˌbuːɖ])▄is▄a").To(BeInFrameAt(12, 11)) - Keyboard("j") - Expect("type▄of▄Scandinavian▄").To(BeInFrameAt(12, 11)) - }) - - Describe("Tabs", func() { - BeforeEach(func() { - ensureOnlyOneTab() - }) - - It("should create a new tab", func() { - Keyboard("t") - Expect("New Tab").To(BeInFrameAt(21, 0)) - }) - - It("should cycle to the next tab", func() { - GotoURL(testSiteURL + "/smorgasbord/") - Keyboard("t") - GotoURL(testSiteURL + "/smorgasbord/another.html") - Keyboard("J") - URL := testSiteURL + "/smorgasbord/ " - Expect(URL).To(BeInFrameAt(0, 1)) - }) - }) -}) diff --git a/webext/src/background/manager.js b/webext/src/background/manager.js index aa54a430..97049aa6 100644 --- a/webext/src/background/manager.js +++ b/webext/src/background/manager.js @@ -66,7 +66,7 @@ export default class extends utils.mixins(CommonMixin, TTYCommandsMixin) { _listenForTerminalMessages() { this.log("Starting to listen to TTY"); this.terminal.addEventListener("message", event => { - this.log("Message from terminal: " + event.data); + // chatty this.log("message from terminal: " + event.data); this.handleTerminalMessage(event.data); }); } diff --git a/webext/src/dom/commands_mixin.js b/webext/src/dom/commands_mixin.js index 8fc8108b..efabe779 100644 --- a/webext/src/dom/commands_mixin.js +++ b/webext/src/dom/commands_mixin.js @@ -364,6 +364,9 @@ export default MixinBase => dom_x - window.scrollX, dom_y - window.scrollY ); + if (!element) { + return; + } element.focus(); var clickEvent = document.createEvent("MouseEvents"); clickEvent.initMouseEvent( diff --git a/webext/src/dom/manager.js b/webext/src/dom/manager.js index 0855b484..da6cce69 100644 --- a/webext/src/dom/manager.js +++ b/webext/src/dom/manager.js @@ -129,6 +129,7 @@ export default class extends utils.mixins(CommonMixin, CommandsMixin) { _setupInteractiveMode() { this._setupDebouncedFunctions(); this._startMutationObserver(); + // TODO: wait until body exists this.sendAllBigFrames(); // TODO: // Disabling CSS transitions is not easy, many pages won't even render @@ -211,15 +212,32 @@ export default class extends utils.mixins(CommonMixin, CommandsMixin) { let target = document.querySelector("body"); let observer = new MutationObserver(mutations => { mutations.forEach(mutation => { + if (!target) { + const nodes = Array.from(mutation.addedNodes); + for (let node of nodes) { + if (node.matches && node.matches("body")) { + target = node; + observer.observe(target, { + subtree: true, + characterData: true, + childList: true + }); + break; + } + } + } this.log("!!MUTATION!!", mutation); this._debouncedSmallTextFrame(); }); }); - observer.observe(target, { - subtree: true, - characterData: true, - childList: true - }); + + if (target) { + observer.observe(target, { + subtree: true, + characterData: true, + childList: true + }); + } } _listenForBackgroundMessages() { diff --git a/webext/src/dom/text_builder.js b/webext/src/dom/text_builder.js index 73387426..10065758 100644 --- a/webext/src/dom/text_builder.js +++ b/webext/src/dom/text_builder.js @@ -78,6 +78,9 @@ export default class extends utils.mixins(CommonMixin, SerialiseMixin) { // Search through every node in the DOM looking for displayable text. __getTextNodes() { + if (!document.body) { + return; + } this._text_nodes = []; const walker = document.createTreeWalker( document.body,