From 2f8468c967ced46dd719dd5a49faef9f618a3bd6 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Silva Date: Fri, 26 Nov 2021 18:26:05 +0100 Subject: [PATCH] GitPod: make instructions more clear As this does not affect people who use the VS Code desktop integration Signed-off-by: Pedro Pinto Silva Change-Id: I10826505d6eec9423a29c93c0c0707c289e8cadb --- .gitpod.yml | 2 +- README.md | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitpod.yml b/.gitpod.yml index c1fb2fca7..2a3d4b54d 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -53,7 +53,7 @@ tasks: - name: Test init: gp await-port 9980 command: | - echo "To open and test in the web browser:" + echo "If you are not using the VS Code desktop and instead just your web browser, to open and test Collabora Online:" echo "1. Make sure your web browser is not blocking any tabs from opening;" echo "2. Check that you have the VCN tab opened (if not, open it up from the left side Remote explorer > 6080)" echo "3. In the terminal where make is running: scroll and copy the the URL ending with: hello-world.odt" diff --git a/README.md b/README.md index 28622b84d..4d0cdca80 100644 --- a/README.md +++ b/README.md @@ -68,8 +68,9 @@ Interesting things to keep in mind: - Make sure your browser is not blocking windows/tabs from opening from the gitpod workspace URL (maybe add `*.gitpod.io` to your browser's whitelist) - The GitPod tasks will run automatically and further instructions will be printed out right in the terminal - VNC tab will open automatically if not just click in the left icon `Remote explorer` and click `6080`. You will see a tab completly black, that's normal. - - As mentioned in those instructions, do not try to click the URL from the make run out put instead copy that URL and execute `firefox [paste URL here]` - - Head over to the tab where the VNC is opened (black page), you will see Firefox opening there, maximize and have fun. -- You can also run cypress tests via GitPod, for that just prepend `CYPRESS_BROWSER="firefox"` to the desired command. Example: `CYPRESS_BROWSER="firefox" make check` for every test or `CYPRESS_BROWSER="firefox" make check-desktop spec=impress/scrolling_spec.js` for one specific test on desktop + - As mentioned in those instructions if you are not using the VS Code desktop and if you are only relying on your browser please: + - Do not try to click the URL from the make run out put instead copy that URL and execute `firefox [paste URL here]` + - Head over to the tab where the VNC is opened (black page), you will see Firefox opening there, maximize and have fun. + - You can also run cypress tests via GitPod but you will need to use Firefox, for that just prepend `CYPRESS_BROWSER="firefox"` to the desired command. Example: `CYPRESS_BROWSER="firefox" make check` for every test or `CYPRESS_BROWSER="firefox" make check-desktop spec=impress/scrolling_spec.js` for one specific test on desktop ## Enjoy!